From 9b118160a8b668b376d25ac16b097bce050f8b67 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 12 Mar 2021 22:06:56 +0100
Subject: [PATCH] Optim & refactor

---
 src/table/gc.rs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/table/gc.rs b/src/table/gc.rs
index 594044b86..5b7f1ee73 100644
--- a/src/table/gc.rs
+++ b/src/table/gc.rs
@@ -116,10 +116,7 @@ where
 		}
 
 		for (k, vhash) in excluded {
-			let _ = self
-				.data
-				.gc_todo
-				.compare_and_swap::<_, _, Vec<u8>>(k, Some(vhash), None)?;
+			self.todo_remove_if_equal(&k[..], vhash)?;
 		}
 
 		if entries.len() == 0 {
@@ -197,15 +194,20 @@ where
 
 		for (k, vhash) in deletes {
 			self.data.delete_if_equal_hash(&k[..], vhash)?;
-			let _ = self
-				.data
-				.gc_todo
-				.compare_and_swap::<_, _, Vec<u8>>(k, Some(vhash), None)?;
+			self.todo_remove_if_equal(&k[..], vhash)?;
 		}
 
 		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 ----
 
 	fn register_handler(self: &Arc<Self>, rpc_server: &mut RpcServer, path: String) {
@@ -232,6 +234,7 @@ where
 			GcRPC::DeleteIfEqualHash(items) => {
 				for (key, vhash) in items.iter() {
 					self.data.delete_if_equal_hash(&key[..], *vhash)?;
+					self.todo_remove_if_equal(&key[..], *vhash)?;
 				}
 				Ok(GcRPC::Ok)
 			}