aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/api/s3_list.rs4
-rw-r--r--src/garage/admin_rpc.rs6
-rw-r--r--src/model/block.rs4
-rw-r--r--src/model/block_ref_table.rs6
-rw-r--r--src/model/bucket_table.rs9
-rw-r--r--src/model/key_table.rs15
-rw-r--r--src/model/object_table.rs7
-rw-r--r--src/model/version_table.rs6
-rw-r--r--src/table/lib.rs3
-rw-r--r--src/table/schema.rs51
-rw-r--r--src/table/util.rs35
11 files changed, 91 insertions, 55 deletions
diff --git a/src/api/s3_list.rs b/src/api/s3_list.rs
index f2b49a1d..3b739a8a 100644
--- a/src/api/s3_list.rs
+++ b/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?;
diff --git a/src/garage/admin_rpc.rs b/src/garage/admin_rpc.rs
index b29f2f77..778e4a1d 100644
--- a/src/garage/admin_rpc.rs
+++ b/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()))
diff --git a/src/model/block.rs b/src/model/block.rs
index 4e8bb7d9..6a5d9c5b 100644
--- a/src/model/block.rs
+++ b/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 {
diff --git a/src/model/block_ref_table.rs b/src/model/block_ref_table.rs
index a00438c0..5a7d9aa1 100644
--- a/src/model/block_ref_table.rs
+++ b/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 {
- !entry.deleted
+ fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
+ filter.apply(entry.deleted)
}
}
diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs
index 28234d82..35c0cc27 100644
--- a/src/model/bucket_table.rs
+++ b/src/model/bucket_table.rs
@@ -75,7 +75,7 @@ impl Entry<EmptyKey, String> for Bucket {
}
fn merge(&mut self, other: &Self) {
- if other.timestamp < self.timestamp {
+ if other.timestamp > self.timestamp {
*self = other.clone();
return;
}
@@ -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 {
- !entry.deleted
+ fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
+ filter.apply(entry.deleted)
}
}
diff --git a/src/model/key_table.rs b/src/model/key_table.rs
index 76d163b5..05b938ce 100644
--- a/src/model/key_table.rs
+++ b/src/model/key_table.rs
@@ -104,6 +104,11 @@ impl Entry<EmptyKey, String> for Key {
}
fn merge(&mut self, other: &Self) {
+ if other.name_timestamp > self.name_timestamp {
+ self.name_timestamp = other.name_timestamp;
+ self.name = other.name.clone();
+ }
+
if other.deleted {
self.deleted = true;
}
@@ -111,10 +116,6 @@ impl Entry<EmptyKey, String> for Key {
self.authorized_buckets.clear();
return;
}
- if other.name_timestamp > self.name_timestamp {
- self.name_timestamp = other.name_timestamp;
- self.name = other.name.clone();
- }
for ab in other.authorized_buckets.iter() {
match self
@@ -142,13 +143,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 {
- !entry.deleted
+ fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
+ filter.apply(entry.deleted)
}
}
diff --git a/src/model/object_table.rs b/src/model/object_table.rs
index 719a222c..929b63f0 100644
--- a/src/model/object_table.rs
+++ b/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 {
- entry.versions.iter().any(|v| v.is_data())
+ fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
+ let deleted = !entry.versions.iter().any(|v| v.is_data());
+ filter.apply(deleted)
}
fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
diff --git a/src/model/version_table.rs b/src/model/version_table.rs
index 6054e389..0d831998 100644
--- a/src/model/version_table.rs
+++ b/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 {
- !entry.deleted
+ fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
+ filter.apply(entry.deleted)
}
}
diff --git a/src/table/lib.rs b/src/table/lib.rs
index ac129146..7684fe9d 100644
--- a/src/table/lib.rs
+++ b/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::*;
diff --git a/src/table/schema.rs b/src/table/schema.rs
index 1914320e..49cede0a 100644
--- a/src/table/schema.rs
+++ b/src/table/schema.rs
@@ -8,54 +8,46 @@ pub trait PartitionKey {
fn hash(&self) -> Hash;
}
-pub trait SortKey {
- fn sort_key(&self) -> &[u8];
-}
-
-pub trait Entry<P: PartitionKey, S: SortKey>:
- PartialEq + Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync
-{
- fn partition_key(&self) -> &P;
- fn sort_key(&self) -> &S;
-
- 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 {
+impl PartitionKey for String {
fn hash(&self) -> Hash {
- [0u8; 32].into()
+ hash(self.as_bytes())
}
}
-impl PartitionKey for String {
+impl PartitionKey for Hash {
fn hash(&self) -> Hash {
- hash(self.as_bytes())
+ self.clone()
}
}
+
+
+pub trait SortKey {
+ fn sort_key(&self) -> &[u8];
+}
+
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()
}
}
+
+pub trait Entry<P: PartitionKey, S: SortKey>:
+ PartialEq + Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync
+{
+ fn partition_key(&self) -> &P;
+ fn sort_key(&self) -> &S;
+
+ fn merge(&mut self, other: &Self);
+}
+
+
#[async_trait]
pub trait TableSchema: Send + Sync {
type P: PartitionKey + Clone + PartialEq + Serialize + for<'de> Deserialize<'de> + Send + Sync;
@@ -74,3 +66,4 @@ pub trait TableSchema: Send + Sync {
true
}
}
+
diff --git a/src/table/util.rs b/src/table/util.rs
new file mode 100644
index 00000000..043a457c
--- /dev/null
+++ b/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,
+ }
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 05:34:57 +0000