From 94f3d287742ff90f179f528421c690b00b71a912 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 11 Mar 2021 16:54:15 +0100
Subject: WIP big refactoring

---
 src/model/block.rs         | 5 ++---
 src/model/garage.rs        | 4 ++--
 src/model/object_table.rs  | 2 +-
 src/model/version_table.rs | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/model')

diff --git a/src/model/block.rs b/src/model/block.rs
index ba5544a3..987ec9e4 100644
--- a/src/model/block.rs
+++ b/src/model/block.rs
@@ -19,8 +19,7 @@ use garage_rpc::membership::System;
 use garage_rpc::rpc_client::*;
 use garage_rpc::rpc_server::*;
 
-use garage_table::table_sharded::TableShardedReplication;
-use garage_table::TableReplication;
+use garage_table::replication::{sharded::TableShardedReplication, TableReplication};
 
 use crate::block_ref_table::*;
 
@@ -412,7 +411,7 @@ impl BlockManager {
 		let garage = self.garage.load_full().unwrap();
 		let mut last_hash = None;
 		let mut i = 0usize;
-		for entry in garage.block_ref_table.store.iter() {
+		for entry in garage.block_ref_table.data.store.iter() {
 			let (_k, v_bytes) = entry?;
 			let block_ref = rmp_serde::decode::from_read_ref::<_, BlockRef>(v_bytes.as_ref())?;
 			if Some(&block_ref.block) == last_hash.as_ref() {
diff --git a/src/model/garage.rs b/src/model/garage.rs
index aac79a85..193c71d2 100644
--- a/src/model/garage.rs
+++ b/src/model/garage.rs
@@ -7,8 +7,8 @@ use garage_rpc::membership::System;
 use garage_rpc::rpc_client::RpcHttpClient;
 use garage_rpc::rpc_server::RpcServer;
 
-use garage_table::table_fullcopy::*;
-use garage_table::table_sharded::*;
+use garage_table::replication::sharded::*;
+use garage_table::replication::fullcopy::*;
 use garage_table::*;
 
 use crate::block::*;
diff --git a/src/model/object_table.rs b/src/model/object_table.rs
index cd09f678..99fad3ce 100644
--- a/src/model/object_table.rs
+++ b/src/model/object_table.rs
@@ -6,7 +6,7 @@ use garage_util::background::BackgroundRunner;
 use garage_util::data::*;
 
 use garage_table::crdt::*;
-use garage_table::table_sharded::*;
+use garage_table::replication::sharded::*;
 use garage_table::*;
 
 use crate::version_table::*;
diff --git a/src/model/version_table.rs b/src/model/version_table.rs
index 7ccc6a33..cdc73a85 100644
--- a/src/model/version_table.rs
+++ b/src/model/version_table.rs
@@ -5,7 +5,7 @@ use garage_util::background::BackgroundRunner;
 use garage_util::data::*;
 
 use garage_table::crdt::*;
-use garage_table::table_sharded::*;
+use garage_table::replication::sharded::*;
 use garage_table::*;
 
 use crate::block_ref_table::*;
-- 
cgit v1.2.3