Slight refactoring to make things clearer with DeletedFilter

src/api/s3_list.rs

@@ -10,6 +10,8 @@ use garage_util::error::Error;
 use garage_model::garage::Garage;
 use garage_model::object_table::*;
 
+use garage_table::DeletedFilter;
+
 use crate::encoding::*;
 
 #[derive(Debug)]
@@ -41,7 +43,7 @@ pub async fn handle_list(
 			.get_range(
 				&bucket.to_string(),
 				Some(next_chunk_start.clone()),
-				Some(()),
+				Some(DeletedFilter::NotDeleted),
 				max_keys + 1,
 			)
 			.await?;

src/garage/admin_rpc.rs

@@ -67,7 +67,7 @@ impl AdminRpcHandler {
 				let bucket_names = self
 					.garage
 					.bucket_table
-					.get_range(&EmptyKey, None, Some(()), 10000)
+					.get_range(&EmptyKey, None, Some(DeletedFilter::NotDeleted), 10000)
 					.await?
 					.iter()
 					.map(|b| b.name.to_string())
@@ -101,7 +101,7 @@ impl AdminRpcHandler {
 				let objects = self
 					.garage
 					.object_table
-					.get_range(&query.name, None, Some(()), 10)
+					.get_range(&query.name, None, Some(DeletedFilter::NotDeleted), 10)
 					.await?;
 				if !objects.is_empty() {
 					return Err(Error::BadRPC(format!("Bucket {} is not empty", query.name)));
@@ -170,7 +170,7 @@ impl AdminRpcHandler {
 				let key_ids = self
 					.garage
 					.key_table
-					.get_range(&EmptyKey, None, Some(()), 10000)
+					.get_range(&EmptyKey, None, Some(DeletedFilter::NotDeleted), 10000)
 					.await?
 					.iter()
 					.map(|k| (k.key_id.to_string(), k.name.to_string()))

src/model/block.rs

@@ -20,7 +20,7 @@ use garage_rpc::rpc_client::*;
 use garage_rpc::rpc_server::*;
 
 use garage_table::table_sharded::TableShardedReplication;
-use garage_table::TableReplication;
+use garage_table::{TableReplication, DeletedFilter};
 
 use crate::block_ref_table::*;
 
@@ -306,7 +306,7 @@ impl BlockManager {
 			let garage = self.garage.load_full().unwrap();
 			let active_refs = garage
 				.block_ref_table
-				.get_range(&hash, None, Some(()), 1)
+				.get_range(&hash, None, Some(DeletedFilter::NotDeleted), 1)
 				.await?;
 			let needed_by_others = !active_refs.is_empty();
 			if needed_by_others {

src/model/block_ref_table.rs

@@ -47,7 +47,7 @@ impl TableSchema for BlockRefTable {
 	type P = Hash;
 	type S = UUID;
 	type E = BlockRef;
-	type Filter = ();
+	type Filter = DeletedFilter;
 
 	async fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) -> Result<(), Error> {
 		let block = &old.as_ref().or(new.as_ref()).unwrap().block;
@@ -62,7 +62,7 @@ impl TableSchema for BlockRefTable {
 		Ok(())
 	}
 
-	fn matches_filter(entry: &Self::E, _filter: &Self::Filter) -> bool {
+	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
-		!entry.deleted
+		filter.apply(entry.deleted)
 	}
 }

src/model/bucket_table.rs

@@ -104,18 +104,19 @@ impl Entry<EmptyKey, String> for Bucket {
 
 pub struct BucketTable;
 
+
 #[async_trait]
 impl TableSchema for BucketTable {
 	type P = EmptyKey;
 	type S = String;
 	type E = Bucket;
-	type Filter = ();
+	type Filter = DeletedFilter;
 
 	async fn updated(&self, _old: Option<Self::E>, _new: Option<Self::E>) -> Result<(), Error> {
 		Ok(())
 	}
 
-	fn matches_filter(entry: &Self::E, _filter: &Self::Filter) -> bool {
+	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
-		!entry.deleted
+		filter.apply(entry.deleted)
 	}
 }

src/model/key_table.rs

@@ -142,13 +142,13 @@ impl TableSchema for KeyTable {
 	type P = EmptyKey;
 	type S = String;
 	type E = Key;
-	type Filter = ();
+	type Filter = DeletedFilter;
 
 	async fn updated(&self, _old: Option<Self::E>, _new: Option<Self::E>) -> Result<(), Error> {
 		Ok(())
 	}
 
-	fn matches_filter(entry: &Self::E, _filter: &Self::Filter) -> bool {
+	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
-		!entry.deleted
+		filter.apply(entry.deleted)
 	}
 }

src/model/object_table.rs

@@ -196,7 +196,7 @@ impl TableSchema for ObjectTable {
 	type P = String;
 	type S = String;
 	type E = Object;
-	type Filter = ();
+	type Filter = DeletedFilter;
 
 	async fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) -> Result<(), Error> {
 		let version_table = self.version_table.clone();
@@ -228,8 +228,9 @@ impl TableSchema for ObjectTable {
 		Ok(())
 	}
 
-	fn matches_filter(entry: &Self::E, _filter: &Self::Filter) -> bool {
+	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
-		entry.versions.iter().any(|v| v.is_data())
+		let deleted = !entry.versions.iter().any(|v| v.is_data());
+		filter.apply(deleted)
 	}
 
 	fn try_migrate(bytes: &[u8]) -> Option<Self::E> {

src/model/version_table.rs

@@ -117,7 +117,7 @@ impl TableSchema for VersionTable {
 	type P = Hash;
 	type S = EmptyKey;
 	type E = Version;
-	type Filter = ();
+	type Filter = DeletedFilter;
 
 	async fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) -> Result<(), Error> {
 		let block_ref_table = self.block_ref_table.clone();
@@ -139,7 +139,7 @@ impl TableSchema for VersionTable {
 		Ok(())
 	}
 
-	fn matches_filter(entry: &Self::E, _filter: &Self::Filter) -> bool {
+	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
-		!entry.deleted
+		filter.apply(entry.deleted)
 	}
 }

src/table/lib.rs

@@ -4,10 +4,13 @@
 extern crate log;
 
 pub mod schema;
+pub mod util;
+
 pub mod table;
 pub mod table_fullcopy;
 pub mod table_sharded;
 pub mod table_sync;
 
 pub use schema::*;
+pub use util::*;
 pub use table::*;

src/table/schema.rs

@@ -8,10 +8,36 @@ pub trait PartitionKey {
 	fn hash(&self) -> Hash;
 }
 
+impl PartitionKey for String {
+	fn hash(&self) -> Hash {
+		hash(self.as_bytes())
+	}
+}
+
+impl PartitionKey for Hash {
+	fn hash(&self) -> Hash {
+		self.clone()
+	}
+}
+
+
 pub trait SortKey {
 	fn sort_key(&self) -> &[u8];
 }
 
+impl SortKey for String {
+	fn sort_key(&self) -> &[u8] {
+		self.as_bytes()
+	}
+}
+
+impl SortKey for Hash {
+	fn sort_key(&self) -> &[u8] {
+		self.as_slice()
+	}
+}
+
+
 pub trait Entry<P: PartitionKey, S: SortKey>:
 	PartialEq + Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync
 {
@@ -21,40 +47,6 @@ pub trait Entry<P: PartitionKey, S: SortKey>:
 	fn merge(&mut self, other: &Self);
 }
 
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct EmptyKey;
-impl SortKey for EmptyKey {
-	fn sort_key(&self) -> &[u8] {
-		&[]
-	}
-}
-impl PartitionKey for EmptyKey {
-	fn hash(&self) -> Hash {
-		[0u8; 32].into()
-	}
-}
-
-impl PartitionKey for String {
-	fn hash(&self) -> Hash {
-		hash(self.as_bytes())
-	}
-}
-impl SortKey for String {
-	fn sort_key(&self) -> &[u8] {
-		self.as_bytes()
-	}
-}
-
-impl PartitionKey for Hash {
-	fn hash(&self) -> Hash {
-		self.clone()
-	}
-}
-impl SortKey for Hash {
-	fn sort_key(&self) -> &[u8] {
-		self.as_slice()
-	}
-}
 
 #[async_trait]
 pub trait TableSchema: Send + Sync {
@@ -74,3 +66,4 @@ pub trait TableSchema: Send + Sync {
 		true
 	}
 }
+

src/table/util.rs

@@ -0,0 +1,35 @@
+use serde::{Deserialize, Serialize};
+
+use garage_util::data::*;
+
+use crate::schema::*;
+
+#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct EmptyKey;
+impl SortKey for EmptyKey {
+	fn sort_key(&self) -> &[u8] {
+		&[]
+	}
+}
+impl PartitionKey for EmptyKey {
+	fn hash(&self) -> Hash {
+		[0u8; 32].into()
+	}
+}
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+pub enum DeletedFilter {
+	All,
+	Deleted,
+	NotDeleted,
+}
+
+impl DeletedFilter {
+	pub fn apply(&self, deleted: bool) -> bool {
+		match self {
+			DeletedFilter::All => true,
+			DeletedFilter::Deleted => deleted,
+			DeletedFilter::NotDeleted => !deleted,
+		}
+	}
+}