From e9fd265ce6d326425994ccfea9d5afc7165460db Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 20 Nov 2020 20:11:04 +0100 Subject: Slight refactoring to make things clearer with DeletedFilter --- src/model/key_table.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/model/key_table.rs') diff --git a/src/model/key_table.rs b/src/model/key_table.rs index 76d163b5..f912b11c 100644 --- a/src/model/key_table.rs +++ b/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, _new: Option) -> 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) } } -- cgit v1.2.3 From 2dc9a4802279a0b7e742f8cf2e2cc85956bb7f83 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 20 Nov 2020 20:12:32 +0100 Subject: Fix reconciliation logic --- src/model/key_table.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/model/key_table.rs') diff --git a/src/model/key_table.rs b/src/model/key_table.rs index f912b11c..05b938ce 100644 --- a/src/model/key_table.rs +++ b/src/model/key_table.rs @@ -104,6 +104,11 @@ impl Entry 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 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 -- cgit v1.2.3