fix(client): remove redundant, add missing and other trivial change

Signed-off-by: lxl66566 <[email protected]> chore(curp): add a missing testcase to lib.rs Signed-off-by: lxl66566 <[email protected]> chore(raw_curp): trivial change to functional expression Signed-off-by: lxl66566 <[email protected]>
xline-kv · Jul 31, 2024 · 15b13bf · 15b13bf
1 parent 8032dfe
commit 15b13bf
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 20 deletions.
diff --git a/crates/curp-test-utils/src/lib.rs b/crates/curp-test-utils/src/lib.rs
@@ -1,5 +1,4 @@
 use std::{
-    env,
     sync::{
         atomic::{AtomicBool, Ordering},
         Arc,
@@ -50,13 +49,14 @@ impl TestRoleChangeInner {
 }
 
 pub fn init_logger() {
-    if env::var("RUST_LOG").is_err() {
-        env::set_var("RUST_LOG", "curp=debug,xline=debug");
-    }
     _ = tracing_subscriber::fmt()
         .with_timer(uptime())
         .compact()
-        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+        .with_env_filter(
+            tracing_subscriber::EnvFilter::default()
+                .add_directive("curp=debug".parse().unwrap())
+                .add_directive("xline=debug".parse().unwrap()),
+        )
         .try_init();
 }
 

diff --git a/crates/curp/src/lib.rs b/crates/curp/src/lib.rs
@@ -244,6 +244,7 @@ mod test {
             (3, 2, 4),
             (4, 3, 5),
             (4, 3, 6),
+            (6, 4, 8),
         ];
 
         for (node_cnt, expected) in nodes.into_iter().zip(expected_res.into_iter()) {

diff --git a/crates/curp/src/server/mod.rs b/crates/curp/src/server/mod.rs
@@ -164,7 +164,6 @@ impl<C: Command, RC: RoleChange> crate::rpc::Protocol for Rpc<C, RC> {
     }
 
     #[instrument(skip_all, name = "lease_keep_alive")]
-    #[allow(clippy::unimplemented)]
     async fn lease_keep_alive(
         &self,
         request: tonic::Request<tonic::Streaming<LeaseKeepAliveMsg>>,

diff --git a/crates/curp/src/server/raw_curp/log.rs b/crates/curp/src/server/raw_curp/log.rs
@@ -171,7 +171,7 @@ impl<C: Command> Log<C> {
             }
             let end = self.li_to_pi(self.batch_end[self.first_idx_in_cur_batch - 1]);
             match end.cmp(&last_index) {
-                // All the `batch_end[i]` lager than `len - 1` should be reset to zero
+                // All the `batch_end[i]` larger than `len - 1` should be reset to zero
                 Ordering::Greater => {
                     self.batch_end[self.first_idx_in_cur_batch - 1] = 0;
                     self.first_idx_in_cur_batch -= 1;
@@ -200,10 +200,12 @@ impl<C: Command> Log<C> {
         }
 
         // recalculate the `cur_batch_size`
-        self.cur_batch_size = 0;
-        for entry in self.entries.iter().skip(self.first_idx_in_cur_batch) {
-            self.cur_batch_size += entry.size;
-        }
+        self.cur_batch_size = self
+            .entries
+            .iter()
+            .skip(self.first_idx_in_cur_batch)
+            .map(|entry| entry.size)
+            .sum();
     }
 
     /// push a log entry into the back of queue

diff --git a/crates/xline-client/src/clients/kv.rs b/crates/xline-client/src/clients/kv.rs
@@ -31,7 +31,6 @@ impl Debug for KvClient {
     #[inline]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("KvClient")
-            .field("kv_client", &self.kv_client)
             .field("kv_client", &self.kv_client)
             .field("token", &self.token)
             .finish()

diff --git a/crates/xline-client/src/clients/lease.rs b/crates/xline-client/src/clients/lease.rs
@@ -35,7 +35,6 @@ impl Debug for LeaseClient {
     #[inline]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("LeaseClient")
-            .field("lease_client", &self.lease_client)
             .field("lease_client", &self.lease_client)
             .field("token", &self.token)
             .field("id_gen", &self.id_gen)

diff --git a/crates/xline/src/storage/alarm_store.rs b/crates/xline/src/storage/alarm_store.rs
@@ -170,12 +170,14 @@ impl AlarmStore {
 
     /// Handle alarm activate request
     fn handle_alarm_activate(&self, member_id: ServerId, alarm: AlarmType) -> Vec<AlarmMember> {
-        let new_alarm = AlarmMember::new(member_id, alarm);
         self.types
             .read()
             .get(&alarm)
             .and_then(|e| e.get(&member_id))
-            .map_or_else(|| vec![new_alarm], |m| vec![m.clone()])
+            .map_or_else(
+                || vec![AlarmMember::new(member_id, alarm)],
+                |m| vec![m.clone()],
+            )
     }
 
     /// Handle alarm deactivate request

diff --git a/crates/xline/src/storage/compact/periodic_compactor.rs b/crates/xline/src/storage/compact/periodic_compactor.rs
@@ -1,5 +1,4 @@
 use std::{
-    cmp::Ordering,
     sync::{
         atomic::{AtomicBool, Ordering::Relaxed},
         Arc,
@@ -133,10 +132,7 @@ impl<C: Compactable> PeriodicCompactor<C> {
 fn sample_config(period: Duration) -> (Duration, usize) {
     /// one hour duration
     const ONEHOUR: Duration = Duration::from_secs(3600);
-    let base_interval = match period.cmp(&ONEHOUR) {
-        Ordering::Less => period,
-        Ordering::Equal | Ordering::Greater => ONEHOUR,
-    };
+    let base_interval = period.min(ONEHOUR);
     let divisor = 10;
     let check_interval = base_interval
         .checked_div(divisor)