diff options
| author | Alex <alex@adnab.me> | 2023-10-10 13:28:28 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-10-10 13:28:28 +0000 |
| commit | e6df7089a19d06696ac2178a4dae7ac9f27fd55e (patch) | |
| tree | e1f7120d582f67fd104dc8e746d883befffb4daa /src/table/merkle.rs | |
| parent | e75fe2157d0973eb4320bbc87be5e54a1cb91a63 (diff) | |
| parent | 952c9570c494468643353ee1ae9052b510353665 (diff) | |
| download | garage-e6df7089a19d06696ac2178a4dae7ac9f27fd55e.tar.gz garage-e6df7089a19d06696ac2178a4dae7ac9f27fd55e.zip | |
Merge pull request 'Garage v0.9' (#473) from next into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/473
Diffstat (limited to 'src/table/merkle.rs')
| -rw-r--r-- | src/table/merkle.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/table/merkle.rs b/src/table/merkle.rs index e86d0251..4577f872 100644 --- a/src/table/merkle.rs +++ b/src/table/merkle.rs @@ -108,9 +108,9 @@ impl<F: TableSchema, R: TableReplication> MerkleUpdater<F, R> { self.data .merkle_tree .db() - .transaction(|mut tx| self.update_item_rec(&mut tx, k, &khash, &key, new_vhash))?; + .transaction(|tx| self.update_item_rec(tx, k, &khash, &key, new_vhash))?; - let deleted = self.data.merkle_todo.db().transaction(|mut tx| { + let deleted = self.data.merkle_todo.db().transaction(|tx| { let remove = matches!(tx.get(&self.data.merkle_todo, k)?, Some(ov) if ov == vhash_by); if remove { tx.remove(&self.data.merkle_todo, k)?; |