refactor: refactor XlineServer

Read issue xline-kv#293 for more details Closes xline-kv#293
Phoenix500526 · Jun 2, 2023 · 68b3b80 · 68b3b80
1 parent d9b6038
commit 68b3b80
Show file tree

Hide file tree

Showing 8 changed files with 226 additions and 220 deletions.
diff --git a/xline/src/header_gen.rs b/xline/src/header_gen.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use parking_lot::Mutex;
 
-use crate::{revision_number::RevisionNumber, rpc::ResponseHeader};
+use crate::{revision_number::RevisionNumberGenerator, rpc::ResponseHeader};
 
 /// Generator of `ResponseHeader`
 #[derive(Debug)]
@@ -14,7 +14,7 @@ pub(crate) struct HeaderGenerator {
     /// term of curp
     term: Arc<Mutex<u64>>,
     /// revision of kv store
-    revision: Arc<RevisionNumber>,
+    revision: Arc<RevisionNumberGenerator>,
 }
 
 impl HeaderGenerator {
@@ -24,7 +24,7 @@ impl HeaderGenerator {
             cluster_id,
             member_id,
             term: Arc::new(Mutex::new(0)),
-            revision: Arc::new(RevisionNumber::default()),
+            revision: Arc::new(RevisionNumberGenerator::default()),
         }
     }
 
@@ -60,7 +60,7 @@ impl HeaderGenerator {
     }
 
     /// Return Arc of revision
-    pub(crate) fn revision_arc(&self) -> Arc<RevisionNumber> {
+    pub(crate) fn revision_arc(&self) -> Arc<RevisionNumberGenerator> {
         Arc::clone(&self.revision)
     }
 }
diff --git a/xline/src/main.rs b/xline/src/main.rs
@@ -434,16 +434,13 @@ async fn main() -> Result<()> {
         cluster_config.name().clone(),
         cluster_config.members().clone(),
         *cluster_config.is_leader(),
-        key_pair,
         cluster_config.curp_config().clone(),
         *cluster_config.client_timeout(),
         *cluster_config.server_timeout(),
         config.storage().clone(),
-        db_proxy,
-    )
-    .await;
+    );
     debug!("{:?}", server);
-    server.start(self_addr).await?;
+    server.start(self_addr, db_proxy, key_pair).await?;
     global::shutdown_tracer_provider();
     Ok(())
 }
diff --git a/xline/src/revision_number.rs b/xline/src/revision_number.rs
@@ -2,9 +2,9 @@ use std::sync::atomic::{AtomicI64, Ordering};
 
 /// Revision number
 #[derive(Debug)]
-pub(crate) struct RevisionNumber(AtomicI64);
+pub(crate) struct RevisionNumberGenerator(AtomicI64);
 
-impl RevisionNumber {
+impl RevisionNumberGenerator {
     /// Create a new revision
     pub(crate) fn new(rev: i64) -> Self {
         Self(AtomicI64::new(rev))
@@ -26,9 +26,9 @@ impl RevisionNumber {
     }
 }
 
-impl Default for RevisionNumber {
+impl Default for RevisionNumberGenerator {
     #[inline]
     fn default() -> Self {
-        RevisionNumber::new(1)
+        RevisionNumberGenerator::new(1)
     }
 }
diff --git a/xline/src/server/command.rs b/xline/src/server/command.rs
@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
 
 use super::barriers::{IdBarrier, IndexBarrier};
 use crate::{
-    revision_number::RevisionNumber,
+    revision_number::RevisionNumberGenerator,
     rpc::{RequestBackend, RequestWithToken, RequestWrapper, ResponseWrapper},
     storage::{db::WriteOp, storage_api::StorageApi, AuthStore, ExecuteError, KvStore, LeaseStore},
 };
@@ -217,9 +217,9 @@ where
     /// Barrier for propose id
     id_barrier: Arc<IdBarrier>,
     /// Revision Number generator for KV request and Lease request
-    general_rev: Arc<RevisionNumber>,
+    general_rev: Arc<RevisionNumberGenerator>,
     /// Revision Number generator for Auth request
-    auth_rev: Arc<RevisionNumber>,
+    auth_rev: Arc<RevisionNumberGenerator>,
 }
 
 impl<S> CommandExecutor<S>
@@ -235,8 +235,8 @@ where
         persistent: Arc<S>,
         index_barrier: Arc<IndexBarrier>,
         id_barrier: Arc<IdBarrier>,
-        general_rev: Arc<RevisionNumber>,
-        auth_rev: Arc<RevisionNumber>,
+        general_rev: Arc<RevisionNumberGenerator>,
+        auth_rev: Arc<RevisionNumberGenerator>,
     ) -> Self {
         Self {
             kv_storage,