diff options
| author | Alex Auvolat <alex@adnab.me> | 2020-12-12 16:05:28 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2020-12-12 16:05:28 +0100 |
| commit | 0b3084ca5ff7884f149f679c6dc391bab46d902d (patch) | |
| tree | 9e2797fea45bb0fe5f55afc205366d45c2c3b0dd /src/table | |
| parent | cbd10c1b0a1325fbd7cf91a43ea0044ba1aae409 (diff) | |
| parent | 022b386a5085cad79d649a82846c41cad730920b (diff) | |
| download | garage-0b3084ca5ff7884f149f679c6dc391bab46d902d.tar.gz garage-0b3084ca5ff7884f149f679c6dc391bab46d902d.zip | |
Merge branch 'master' into doc/modeldoc/model
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/table.rs | 3 |
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); |