From f319a7d3740ba8b83c9c0eae27edfda1c1d14c03 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 10 Mar 2021 16:21:56 +0100
Subject: Refactor model stuff, including cleaner CRDTs

---
 src/model/bucket_table.rs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/model/bucket_table.rs')

diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs
index 2878aa38..5bc8b7f9 100644
--- a/src/model/bucket_table.rs
+++ b/src/model/bucket_table.rs
@@ -89,7 +89,9 @@ impl Entry<EmptyKey, String> for Bucket {
 	fn sort_key(&self) -> &String {
 		&self.name
 	}
+}
 
+impl CRDT for Bucket {
 	fn merge(&mut self, other: &Self) {
 		self.state.merge(&other.state);
 	}
-- 
cgit v1.2.3


From 445912dc6a3b65d0726b9378b3542b4061272cf4 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 10 Mar 2021 16:38:31 +0100
Subject: Remove migration paths from 0.1 branch

---
 src/model/bucket_table.rs | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

(limited to 'src/model/bucket_table.rs')

diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs
index 5bc8b7f9..6330dced 100644
--- a/src/model/bucket_table.rs
+++ b/src/model/bucket_table.rs
@@ -5,11 +5,6 @@ use garage_table::*;
 
 use crate::key_table::PermissionSet;
 
-// We import the same file but in its version 0.1.0.
-// We can then access v0.1.0 data structures.
-// We use them to perform migrations.
-use model010::bucket_table as prev;
-
 /// A bucket is a collection of objects
 ///
 /// Its parameters are not directly accessible as:
@@ -108,39 +103,4 @@ impl TableSchema for BucketTable {
 	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
 		filter.apply(entry.is_deleted())
 	}
-
-	fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
-		let old = match rmp_serde::decode::from_read_ref::<_, prev::Bucket>(bytes) {
-			Ok(x) => x,
-			Err(_) => return None,
-		};
-		if old.deleted {
-			Some(Bucket {
-				name: old.name,
-				state: crdt::LWW::migrate_from_raw(old.timestamp, BucketState::Deleted),
-			})
-		} else {
-			let mut keys = crdt::LWWMap::new();
-			for ak in old.authorized_keys() {
-				keys.merge(&crdt::LWWMap::migrate_from_raw_item(
-					ak.key_id.clone(),
-					ak.timestamp,
-					PermissionSet {
-						allow_read: ak.allow_read,
-						allow_write: ak.allow_write,
-					},
-				));
-			}
-
-			let params = BucketParams {
-				authorized_keys: keys,
-				website: crdt::LWW::new(false),
-			};
-
-			Some(Bucket {
-				name: old.name,
-				state: crdt::LWW::migrate_from_raw(old.timestamp, BucketState::Present(params)),
-			})
-		}
-	}
 }
-- 
cgit v1.2.3