wip

lablup · Sep 27, 2024 · 0416bec · 0416bec
1 parent 8a82411
commit 0416bec
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/examples/memstore/src/web_server_api.rs b/examples/memstore/src/web_server_api.rs
@@ -1,8 +1,7 @@
 use std::collections::HashMap;
 
 use actix_web::{get, put, web, Responder};
-use raftify::raft::Storage;
-use raftify::{AbstractLogEntry, StableStorage};
+use raftify::{raft::Storage, AbstractLogEntry, StableStorage};
 use serde_json::Value;
 
 use crate::state_machine::{HashStore, LogEntry, Raft};

diff --git a/raftify/src/cli/commands/debug.rs b/raftify/src/cli/commands/debug.rs
@@ -13,7 +13,7 @@ use crate::{
 };
 
 #[cfg(feature = "inmemory_storage")]
-use raftify::MemStorage;
+use crate::MemStorage;
 
 #[cfg(feature = "heed_storage")]
 use crate::HeedStorage;

diff --git a/raftify/src/cli/mod.rs b/raftify/src/cli/mod.rs
@@ -9,10 +9,15 @@ use std::{fmt::Debug, sync::Arc};
 
 use crate::{
     raft::{default_logger, formatter::set_custom_formatter},
-    AbstractLogEntry, AbstractStateMachine, Config, CustomFormatter, HeedStorage, Result,
-    StableStorage,
+    AbstractLogEntry, AbstractStateMachine, Config, CustomFormatter, Result, StableStorage,
 };
 
+#[cfg(feature = "inmemory_storage")]
+use crate::MemStorage;
+
+#[cfg(feature = "heed_storage")]
+use crate::HeedStorage;
+
 #[derive(Parser)]
 #[command(name = "raftify")]
 #[command(version = PKG_VERSION)]

diff --git a/raftify/src/raft_node/mod.rs b/raftify/src/raft_node/mod.rs
@@ -479,8 +479,7 @@ pub struct RaftNodeCore<
     FSM: AbstractStateMachine + Clone + 'static,
 > {
     pub raw_node: RawNode<LogStorage>,
-    pub log_storage: LogStorage,
-
+    // pub log_storage: LogStorage,
     pub fsm: FSM,
     pub peers: Arc<Mutex<Peers>>,
     response_seq: AtomicU64,
@@ -577,7 +576,6 @@ impl<
 
         Ok(RaftNodeCore {
             raw_node,
-            log_storage,
             fsm,
             response_seq,
             config,
@@ -594,6 +592,7 @@ impl<
             tx_self,
             rx_self,
             _phantom_log_entry_typ: PhantomData,
+            // log_storage,
         })
     }