Simpler Merkle & sync

1 files changed, 4 insertions, 6 deletions

diff --git a/src/table/replication/parameters.rs b/src/table/replication/parameters.rs
index ace82bd9..e46bd172 100644
--- a/src/table/replication/parameters.rs
+++ b/src/table/replication/parameters.rs
@@ -1,4 +1,4 @@
-use garage_rpc::ring::Ring;
+use garage_rpc::ring::*;
 
 use garage_util::data::*;
 
@@ -6,9 +6,6 @@ pub trait TableReplication: Send + Sync {
 	// See examples in table_sharded.rs and table_fullcopy.rs
 	// To understand various replication methods
 
-	// Partition number of data item (for Merkle tree)
-	fn partition_of(&self, hash: &Hash) -> u16;
-
 	// Which nodes to send reads from
 	fn read_nodes(&self, hash: &Hash) -> Vec<UUID>;
 	fn read_quorum(&self) -> usize;
@@ -18,6 +15,7 @@ pub trait TableReplication: Send + Sync {
 	fn write_quorum(&self) -> usize;
 	fn max_write_errors(&self) -> usize;
 
-	// Get partition boundaries
-	fn split_points(&self, ring: &Ring) -> Vec<Hash>;
+	// Accessing partitions, for Merkle tree & sync
+	fn partition_of(&self, hash: &Hash) -> Partition;
+	fn partitions(&self) -> Vec<(Partition, Hash)>;
 }