diff options
| author | Alex <alex@adnab.me> | 2020-12-06 15:27:58 +0100 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2020-12-06 15:27:58 +0100 |
| commit | 857440f19215422798dcda44cf85bfce439e9032 (patch) | |
| tree | b62af2c15d29e9fd061d884ff9856962bef6cf2a /src/table/table.rs | |
| parent | 39f45b3058e0d6705bdd94037c0876a2af6d5a74 (diff) | |
| parent | 4a5bbbb81088c9bd25bbe142f67daf4669b6538e (diff) | |
| download | garage-857440f19215422798dcda44cf85bfce439e9032.tar.gz garage-857440f19215422798dcda44cf85bfce439e9032.zip | |
Merge pull request 'Propose ETag fix' (#23) from bug/etag into master
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/23
Diffstat (limited to 'src/table/table.rs')
| -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); |