aboutsummaryrefslogtreecommitdiff
path: root/src/table/table.rs
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-12-10 20:12:56 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-12-10 20:12:56 +0100
commite8c12072cefa37d9aec023fd6087b2d190ee3e4c (patch)
tree88b15bfe703d2454d99550010ad04934513d25a4 /src/table/table.rs
parent51d0c14e440f00f24dbed6c3bce915a183a2bb65 (diff)
parent022b386a5085cad79d649a82846c41cad730920b (diff)
downloadgarage-e8c12072cefa37d9aec023fd6087b2d190ee3e4c.tar.gz
garage-e8c12072cefa37d9aec023fd6087b2d190ee3e4c.zip
Merge branch 'master' into feature/website
Diffstat (limited to 'src/table/table.rs')
-rw-r--r--src/table/table.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/table/table.rs b/src/table/table.rs
index 5dfee3c8..acb46325 100644
--- a/src/table/table.rs
+++ b/src/table/table.rs
@@ -391,7 +391,8 @@ where
let (old_entry, new_entry) = self.store.transaction(|db| {
let (old_entry, new_entry) = match db.get(&tree_key)? {
Some(prev_bytes) => {
- let old_entry = self.decode_entry(&prev_bytes)
+ let old_entry = self
+ .decode_entry(&prev_bytes)
.map_err(sled::ConflictableTransactionError::Abort)?;
let mut new_entry = old_entry.clone();
new_entry.merge(&update);