Refactor: try_get_log_entries() does not need Sync

databendlabs · Feb 21, 2024 · a727017 · a727017
1 parent bad06bc
commit a727017
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 18 deletions.
diff --git a/cluster_benchmark/tests/benchmark/store.rs b/cluster_benchmark/tests/benchmark/store.rs
@@ -102,7 +102,7 @@ impl StateMachineStore {
 }
 
 impl RaftLogReader<TypeConfig> for Arc<LogStore> {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> Result<Vec<Entry<TypeConfig>>, StorageError<NodeId>> {

diff --git a/examples/raft-kv-memstore/src/store/mod.rs b/examples/raft-kv-memstore/src/store/mod.rs
@@ -15,7 +15,6 @@ use openraft::Entry;
 use openraft::EntryPayload;
 use openraft::LogId;
 use openraft::OptionalSend;
-use openraft::OptionalSync;
 use openraft::RaftLogReader;
 use openraft::RaftSnapshotBuilder;
 use openraft::RaftTypeConfig;
@@ -103,7 +102,7 @@ pub struct LogStore {
 }
 
 impl RaftLogReader<TypeConfig> for Arc<LogStore> {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> Result<Vec<Entry<TypeConfig>>, StorageError<NodeId>> {

diff --git a/examples/raft-kv-rocksdb/src/store.rs b/examples/raft-kv-rocksdb/src/store.rs
@@ -20,7 +20,6 @@ use openraft::ErrorSubject;
 use openraft::ErrorVerb;
 use openraft::LogId;
 use openraft::OptionalSend;
-use openraft::OptionalSync;
 use openraft::RaftLogReader;
 use openraft::RaftSnapshotBuilder;
 use openraft::SnapshotMeta;
@@ -369,7 +368,7 @@ impl LogStore {
 }
 
 impl RaftLogReader<TypeConfig> for LogStore {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> StorageResult<Vec<Entry<TypeConfig>>> {

diff --git a/memstore/src/lib.rs b/memstore/src/lib.rs
@@ -19,7 +19,6 @@ use openraft::Entry;
 use openraft::EntryPayload;
 use openraft::LogId;
 use openraft::OptionalSend;
-use openraft::OptionalSync;
 use openraft::RaftLogId;
 use openraft::RaftStorage;
 use openraft::RaftTypeConfig;
@@ -207,7 +206,7 @@ impl Default for MemStore {
 }
 
 impl RaftLogReader<TypeConfig> for Arc<MemStore> {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> Result<Vec<Entry<TypeConfig>>, StorageError<MemNodeId>> {

diff --git a/openraft/src/storage/adapter.rs b/openraft/src/storage/adapter.rs
@@ -15,7 +15,6 @@ use crate::storage::RaftStateMachine;
 use crate::LogId;
 use crate::LogState;
 use crate::OptionalSend;
-use crate::OptionalSync;
 use crate::RaftLogReader;
 use crate::RaftStorage;
 use crate::RaftTypeConfig;
@@ -102,7 +101,7 @@ where
     C: RaftTypeConfig,
     S: RaftStorage<C>,
 {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> Result<Vec<C::Entry>, StorageError<C::NodeId>> {

diff --git a/openraft/src/storage/mod.rs b/openraft/src/storage/mod.rs
@@ -157,7 +157,7 @@ where C: RaftTypeConfig
     /// stop)`.
     ///
     /// Entry that is not found is allowed.
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> Result<Vec<C::Entry>, StorageError<C::NodeId>>;

diff --git a/rocksstore-compat07/src/lib.rs b/rocksstore-compat07/src/lib.rs
@@ -43,7 +43,6 @@ use openraft::ErrorVerb;
 use openraft::LogId;
 use openraft::LogState;
 use openraft::OptionalSend;
-use openraft::OptionalSync;
 use openraft::RaftLogReader;
 use openraft::RaftSnapshotBuilder;
 use openraft::RaftStorage;
@@ -370,7 +369,7 @@ impl RocksStore {
 }
 
 impl RaftLogReader<TypeConfig> for Arc<RocksStore> {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> StorageResult<Vec<Entry<TypeConfig>>> {

diff --git a/rocksstore/src/lib.rs b/rocksstore/src/lib.rs
@@ -24,7 +24,6 @@ use openraft::EntryPayload;
 use openraft::ErrorVerb;
 use openraft::LogId;
 use openraft::OptionalSend;
-use openraft::OptionalSync;
 use openraft::RaftLogReader;
 use openraft::RaftSnapshotBuilder;
 use openraft::RaftStorage;
@@ -340,7 +339,7 @@ impl RocksStore {
 }
 
 impl RaftLogReader<TypeConfig> for Arc<RocksStore> {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> StorageResult<Vec<Entry<TypeConfig>>> {

diff --git a/sledstore/src/lib.rs b/sledstore/src/lib.rs
@@ -22,7 +22,6 @@ use openraft::Entry;
 use openraft::EntryPayload;
 use openraft::LogId;
 use openraft::OptionalSend;
-use openraft::OptionalSync;
 use openraft::RaftLogId;
 use openraft::RaftLogReader;
 use openraft::RaftSnapshotBuilder;
@@ -386,7 +385,7 @@ impl SledStore {
 }
 
 impl RaftLogReader<TypeConfig> for Arc<SledStore> {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> StorageResult<Vec<Entry<TypeConfig>>> {

diff --git a/stores/rocksstore-v2/src/lib.rs b/stores/rocksstore-v2/src/lib.rs
@@ -30,7 +30,6 @@ use openraft::EntryPayload;
 use openraft::ErrorVerb;
 use openraft::LogId;
 use openraft::OptionalSend;
-use openraft::OptionalSync;
 use openraft::RaftLogId;
 use openraft::RaftLogReader;
 use openraft::RaftSnapshotBuilder;
@@ -233,7 +232,7 @@ impl RocksLogStore {
 }
 
 impl RaftLogReader<TypeConfig> for RocksLogStore {
-    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend + OptionalSync>(
+    async fn try_get_log_entries<RB: RangeBounds<u64> + Clone + Debug + OptionalSend>(
         &mut self,
         range: RB,
     ) -> StorageResult<Vec<Entry<TypeConfig>>> {