aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-06-07 17:21:01 +0200
committerAlex Auvolat <alex@adnab.me>2022-06-07 17:21:01 +0200
commit6f3d43b75b45dc9aca03c0598f81f4cb2c2013b2 (patch)
tree39e76493c2bf82010a87054a86d9dde6e9545592
parent8c6f690fa584e6f1bccc428d2b5525ba219e16c2 (diff)
downloadgarage-6f3d43b75b45dc9aca03c0598f81f4cb2c2013b2.tar.gz
garage-6f3d43b75b45dc9aca03c0598f81f4cb2c2013b2.zip
prettier code
-rw-r--r--src/db/counted_tree_hack.rs23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/db/counted_tree_hack.rs b/src/db/counted_tree_hack.rs
index 354a9dad..bbe943a2 100644
--- a/src/db/counted_tree_hack.rs
+++ b/src/db/counted_tree_hack.rs
@@ -30,7 +30,7 @@ impl CountedTree {
}
pub fn len(&self) -> usize {
- self.0.len.load(Ordering::Relaxed)
+ self.0.len.load(Ordering::SeqCst)
}
pub fn is_empty(&self) -> bool {
@@ -58,7 +58,7 @@ impl CountedTree {
{
let old_val = self.0.tree.insert(key, value)?;
if old_val.is_none() {
- self.0.len.fetch_add(1, Ordering::Relaxed);
+ self.0.len.fetch_add(1, Ordering::SeqCst);
}
Ok(old_val)
}
@@ -66,7 +66,7 @@ impl CountedTree {
pub fn remove<K: AsRef<[u8]>>(&self, key: K) -> Result<Option<Value>> {
let old_val = self.0.tree.remove(key)?;
if old_val.is_some() {
- self.0.len.fetch_sub(1, Ordering::Relaxed);
+ self.0.len.fetch_sub(1, Ordering::SeqCst);
}
Ok(old_val)
}
@@ -85,9 +85,14 @@ impl CountedTree {
let old_some = expected_old.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)?;
- 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 {
Some(v) => {
tx.insert(&self.0.tree, &key, v)?;
@@ -100,14 +105,16 @@ impl CountedTree {
} else {
tx.abort(())
}
- }) {
+ });
+
+ match tx_res {
Ok(()) => {
match (old_some, new_some) {
(false, true) => {
- self.0.len.fetch_add(1, Ordering::Relaxed);
+ self.0.len.fetch_add(1, Ordering::SeqCst);
}
(true, false) => {
- self.0.len.fetch_sub(1, Ordering::Relaxed);
+ self.0.len.fetch_sub(1, Ordering::SeqCst);
}
_ => (),
}