Deuxfleurs/garage
47
55
Fork 70
Code Issues 97 Pull requests 13 Releases 30 Wiki Activity

prettier code

Browse source
This commit is contained in:
Alex 2022-06-07 17:21:01 +02:00
parent 8c6f690fa5
commit 6f3d43b75b
Signed by: lx
GPG key ID: 0E496D15096376BE
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/db/counted_tree_hack.rs
View file

@ -30,7 +30,7 @@ impl CountedTree {
} }
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
self.0.len.load(Ordering::Relaxed) self.0.len.load(Ordering::SeqCst)
} }
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
@ -58,7 +58,7 @@ impl CountedTree {
{ {
let old_val = self.0.tree.insert(key, value)?; let old_val = self.0.tree.insert(key, value)?;
if old_val.is_none() { if old_val.is_none() {
self.0.len.fetch_add(1, Ordering::Relaxed); self.0.len.fetch_add(1, Ordering::SeqCst);
} }
Ok(old_val) Ok(old_val)
} }
@ -66,7 +66,7 @@ impl CountedTree {
pub fn remove<K: AsRef<[u8]>>(&self, key: K) -> Result<Option<Value>> { pub fn remove<K: AsRef<[u8]>>(&self, key: K) -> Result<Option<Value>> {
let old_val = self.0.tree.remove(key)?; let old_val = self.0.tree.remove(key)?;
if old_val.is_some() { if old_val.is_some() {
self.0.len.fetch_sub(1, Ordering::Relaxed); self.0.len.fetch_sub(1, Ordering::SeqCst);
} }
Ok(old_val) Ok(old_val)
} }
@ -85,9 +85,14 @@ impl CountedTree {
let old_some = expected_old.is_some(); let old_some = expected_old.is_some();
let new_some = new.is_some(); let new_some = new.is_some();
match self.0.tree.db().transaction(|mut tx| { let tx_res = self.0.tree.db().transaction(|mut tx| {
let old_val = tx.get(&self.0.tree, &key)?; let old_val = tx.get(&self.0.tree, &key)?;
if old_val.as_ref().map(|x| &x[..]) == expected_old.as_ref().map(AsRef::as_ref) { let is_same = match (&old_val, &expected_old) {
(None, None) => true,
(Some(x), Some(y)) if x == y.as_ref() => true,
_ => false,
};
if is_same {
match &new { match &new {
Some(v) => { Some(v) => {
tx.insert(&self.0.tree, &key, v)?; tx.insert(&self.0.tree, &key, v)?;
@ -100,14 +105,16 @@ impl CountedTree {
} else { } else {
tx.abort(()) tx.abort(())
} }
}) { });
match tx_res {
Ok(()) => { Ok(()) => {
match (old_some, new_some) { match (old_some, new_some) {
(false, true) => { (false, true) => {
self.0.len.fetch_add(1, Ordering::Relaxed); self.0.len.fetch_add(1, Ordering::SeqCst);
} }
(true, false) => { (true, false) => {
self.0.len.fetch_sub(1, Ordering::Relaxed); self.0.len.fetch_sub(1, Ordering::SeqCst);
} }
_ => (), _ => (),
} }