jpds/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues 32 Pull requests Projects Releases Packages Wiki Activity

Optim & refactor

Browse source
This commit is contained in:
Alex 2021-03-12 22:06:56 +01:00
parent 831eb35763
commit 9b118160a8
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/table/gc.rs
View file

@ -116,10 +116,7 @@ where
} }
for (k, vhash) in excluded { for (k, vhash) in excluded {
let _ = self self.todo_remove_if_equal(&k[..], vhash)?;
.data
.gc_todo
.compare_and_swap::<_, _, Vec<u8>>(k, Some(vhash), None)?;
} }
if entries.len() == 0 { if entries.len() == 0 {
@ -197,15 +194,20 @@ where
for (k, vhash) in deletes { for (k, vhash) in deletes {
self.data.delete_if_equal_hash(&k[..], vhash)?; self.data.delete_if_equal_hash(&k[..], vhash)?;
let _ = self self.todo_remove_if_equal(&k[..], vhash)?;
.data
.gc_todo
.compare_and_swap::<_, _, Vec<u8>>(k, Some(vhash), None)?;
} }
Ok(()) Ok(())
} }
fn todo_remove_if_equal(&self, key: &[u8], vhash: Hash) -> Result<(), Error> {
let _ = self
.data
.gc_todo
.compare_and_swap::<_, _, Vec<u8>>(key, Some(vhash), None)?;
Ok(())
}
// ---- RPC HANDLER ---- // ---- RPC HANDLER ----
fn register_handler(self: &Arc<Self>, rpc_server: &mut RpcServer, path: String) { fn register_handler(self: &Arc<Self>, rpc_server: &mut RpcServer, path: String) {
@ -232,6 +234,7 @@ where
GcRPC::DeleteIfEqualHash(items) => { GcRPC::DeleteIfEqualHash(items) => {
for (key, vhash) in items.iter() { for (key, vhash) in items.iter() {
self.data.delete_if_equal_hash(&key[..], *vhash)?; self.data.delete_if_equal_hash(&key[..], *vhash)?;
self.todo_remove_if_equal(&key[..], *vhash)?;
} }
Ok(GcRPC::Ok) Ok(GcRPC::Ok)
} }