gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-18 17:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into doc/model

Browse Source
This commit is contained in:
Alex Auvolat
2020-12-12 16:05:28 +01:00
parent cbd10c1b0a 022b386a50
commit 0b3084ca5f
31 changed files with 2748 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/table/table.rs
+2 -1
View File
@@ -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);