M Cargo.lock

Author: drmingdrmer

Cargo.lock

@@ -376,7 +376,7 @@ logforth = { git = "https://github.com/datafuse-extras/logforth", branch = "main
     'fastrace',
 ] }
 lz4 = "1.24.0"
-map-api = { version = "0.4.0" }
+map-api = { version = "0.4.1" }
 maplit = "1.0.2"
 match-template = "0.0.1"
 md-5 = "0.10.5"
@@ -498,7 +498,7 @@ socket2 = "0.5.3"
 span-map = { version = "0.2.0" }
 sqlx = { version = "0.8", features = ["mysql", "runtime-tokio"] }
 state = "0.6.0"
-state-machine-api = { version = "0.3.0" }
+state-machine-api = { version = "0.3.1" }
 stream-more = "0.1.3"
 strength_reduce = "0.2.4"
 stringslice = "0.2.0"
@@ -657,14 +657,12 @@ backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git", rev = "7226
 color-eyre = { git = "https://github.com/eyre-rs/eyre.git", rev = "e5d92c3" }
 deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "9954bff" }
 display-more = { git = "https://github.com/databendlabs/display-more", tag = "v0.2.0" }
-map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.4.0" }
-#map-api = { path = "../map-api"}
-#state-machine-api = { path = "../state-machine-api"}
+map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.4.1" }
 openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-alpha.9" }
 orc-rust = { git = "https://github.com/datafuse-extras/orc-rust", rev = "d82aa6d" }
 recursive = { git = "https://github.com/datafuse-extras/recursive.git", rev = "16e433a" }
 sled = { git = "https://github.com/datafuse-extras/sled", tag = "v0.34.7-datafuse.1" }
-state-machine-api = { git = "https://github.com/databendlabs/state-machine-api.git", tag = "v0.3.0" }
+state-machine-api = { git = "https://github.com/databendlabs/state-machine-api.git", tag = "v0.3.1" }
 sub-cache = { git = "https://github.com/databendlabs/sub-cache", tag = "v0.2.1" }
 tantivy = { git = "https://github.com/datafuse-extras/tantivy", rev = "7502370" }
 tantivy-common = { git = "https://github.com/datafuse-extras/tantivy", rev = "7502370", package = "tantivy-common" }

Cargo.toml

@@ -30,7 +30,7 @@ use state_machine_api::ExpireValue;
 use state_machine_api::UserKey;
 
 use crate::key_spaces::SMEntry;
-use crate::leveled_store::db_map_api_ro_impl::MapView;
+use crate::leveled_store::db_impl_scoped_seq_bounded_read::ScopedSeqBoundedRead;
 use crate::state_machine::StateMachineMetaKey;
 use crate::state_machine::StateMachineMetaValue;
 
@@ -93,7 +93,7 @@ impl<'a> DBExporter<'a> {
 
         // expire index
 
-        let strm = MapView(self.db)
+        let strm = ScopedSeqBoundedRead(self.db)
             .range(ExpireKey::default().., u64::MAX)
             .await?;
         let expire_strm = strm.try_filter_map(|(exp_k, marked)| {
@@ -105,7 +105,7 @@ impl<'a> DBExporter<'a> {
 
         // kv
 
-        let strm = MapView(self.db)
+        let strm = ScopedSeqBoundedRead(self.db)
             .range(UserKey::default().., u64::MAX)
             .await?;
         let kv_strm = strm.try_filter_map(|(user_key, seq_marked)| {

src/meta/raft-store/src/leveled_store/db_exporter.rs

@@ -32,11 +32,11 @@ use crate::leveled_store::value_convert::ValueConvert;
 
 /// A wrapper that implements the `ScopedSnapshot*` trait for the `DB`.
 #[derive(Debug, Clone)]
-pub struct MapView<'a>(pub &'a DB);
+pub struct ScopedSeqBoundedRead<'a>(pub &'a DB);
 
 // TODO: test
 #[async_trait::async_trait]
-impl<K> mvcc::ScopedSeqBoundedGet<K, K::V> for MapView<'_>
+impl<K> mvcc::ScopedSeqBoundedGet<K, K::V> for ScopedSeqBoundedRead<'_>
 where
     K: MapKey,
     K: ViewKey,
@@ -62,7 +62,7 @@ where
 
 // TODO: test
 #[async_trait::async_trait]
-impl<K> mvcc::ScopedSeqBoundedRange<K, K::V> for MapView<'_>
+impl<K> mvcc::ScopedSeqBoundedRange<K, K::V> for ScopedSeqBoundedRead<'_>
 where
     K: MapKey,
     K: ViewKey,

src/meta/raft-store/src/leveled_store/db_map_api_ro_impl.rs renamed to src/meta/raft-store/src/leveled_store/db_impl_scoped_seq_bounded_read.rs

@@ -24,11 +24,11 @@ use state_machine_api::KVMeta;
 use state_machine_api::UserKey;
 
 use crate::leveled_store::db_builder::DBBuilder;
-use crate::leveled_store::db_map_api_ro_impl::MapView;
+use crate::leveled_store::db_impl_scoped_seq_bounded_read::ScopedSeqBoundedRead;
 use crate::sm_v003::SMV003;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 3)]
-async fn test_db_map_api_ro() -> anyhow::Result<()> {
+async fn test_db_scoped_seq_bounded_read() -> anyhow::Result<()> {
     // Build a state machine
     let mut sm = {
         let mut sm = SMV003::default();
@@ -71,7 +71,7 @@ async fn test_db_map_api_ro() -> anyhow::Result<()> {
 
     // Test kv map
 
-    let binding = MapView(&db);
+    let binding = ScopedSeqBoundedRead(&db);
     let smap = binding;
     assert_eq!(
         SeqMarked::new_normal(4, (Some(KVMeta::new(Some(15))), b("a1"))),
@@ -112,7 +112,7 @@ async fn test_db_map_api_ro() -> anyhow::Result<()> {
 
     // Test expire index
 
-    let binding = MapView(&db);
+    let binding = ScopedSeqBoundedRead(&db);
     let emap = binding;
 
     assert_eq!(

src/meta/raft-store/src/leveled_store/db_map_api_ro_test.rs renamed to src/meta/raft-store/src/leveled_store/db_scoped_seq_bounded_read_test.rs

@@ -21,7 +21,7 @@ use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
 use map_api::mvcc;
-use map_api::mvcc::ScopedSnapshotIntoRange;
+use map_api::mvcc::ScopedSeqBoundedIntoRange;
 use map_api::mvcc::ViewKey;
 use map_api::mvcc::ViewValue;
 use map_api::IOResultStream;
@@ -137,8 +137,8 @@ mod tests {
     where
         T: mvcc::ScopedSeqBoundedRangeIter<UserKey, MetaValue>,
         T: mvcc::ScopedSeqBoundedRangeIter<ExpireKey, String>,
-        T: mvcc::ScopedSnapshotIntoRange<UserKey, MetaValue>,
-        T: mvcc::ScopedSnapshotIntoRange<ExpireKey, String>,
+        T: mvcc::ScopedSeqBoundedIntoRange<UserKey, MetaValue>,
+        T: mvcc::ScopedSeqBoundedIntoRange<ExpireKey, String>,
         T: mvcc::ScopedSeqBoundedRange<UserKey, MetaValue>,
         T: mvcc::ScopedSeqBoundedRange<ExpireKey, String>,
     {

src/meta/raft-store/src/leveled_store/immutable.rs

@@ -18,7 +18,7 @@ use std::ops::RangeBounds;
 
 use futures_util::StreamExt;
 use map_api::mvcc;
-use map_api::mvcc::ScopedSnapshotIntoRange;
+use map_api::mvcc::ScopedSeqBoundedIntoRange;
 use map_api::mvcc::ViewKey;
 use map_api::mvcc::ViewValue;
 use map_api::util;
@@ -111,7 +111,7 @@ impl<K> mvcc::ScopedSeqBoundedRange<K, K::V> for ImmutableLevels
 where
     K: MapKey,
     K::V: ViewValue,
-    Immutable: mvcc::ScopedSnapshotIntoRange<K, K::V>,
+    Immutable: mvcc::ScopedSeqBoundedIntoRange<K, K::V>,
 {
     async fn range<R>(
         &self,

src/meta/raft-store/src/leveled_store/immutable_levels.rs

@@ -35,7 +35,7 @@ use crate::leveled_store::level_index::LevelIndex;
 use crate::leveled_store::map_api::MapKeyDecode;
 use crate::leveled_store::map_api::MapKeyEncode;
 use crate::leveled_store::value_convert::ValueConvert;
-use crate::leveled_store::MapView;
+use crate::leveled_store::ScopedSeqBoundedRead;
 
 #[derive(Debug, Default, Clone)]
 pub struct ImmutableData {
@@ -124,7 +124,7 @@ where
             return Ok(SeqMarked::new_not_found());
         };
 
-        mvcc::ScopedSeqBoundedGet::get(&MapView(db), key, snapshot_seq).await
+        mvcc::ScopedSeqBoundedGet::get(&ScopedSeqBoundedRead(db), key, snapshot_seq).await
     }
 }
 
@@ -158,7 +158,7 @@ where
         // Bottom db level
 
         if let Some(db) = self.persisted() {
-            let map_view = MapView(db);
+            let map_view = ScopedSeqBoundedRead(db);
             // NOTE: we assume a mvcc version won't use a version that is in a persisted db.
             //       Because we need to wait for a mvcc version to release in order to persist a db.
             //       Because when persisting, it may need to remove tombstone permanently.

src/meta/raft-store/src/leveled_store/leveled_map/immutable_data.rs

@@ -29,11 +29,11 @@ pub mod util;
 pub mod value_convert;
 pub mod view;
 
-mod db_map_api_ro_impl;
-#[cfg(test)]
-mod db_map_api_ro_test;
+mod db_impl_scoped_seq_bounded_read;
 mod db_open_snapshot_impl;
+#[cfg(test)]
+mod db_scoped_seq_bounded_read_test;
 mod key_spaces_impl;
 mod rotbl_seq_mark_impl;
 
-pub use db_map_api_ro_impl::MapView;
+pub use db_impl_scoped_seq_bounded_read::ScopedSeqBoundedRead;

src/meta/raft-store/src/leveled_store/mod.rs

@@ -64,6 +64,11 @@ impl StateMachineView {
     pub fn into_inner(self) -> MvccView {
         self.inner
     }
+
+    pub async fn commit(self) -> Result<(), io::Error> {
+        self.into_inner().commit().await?;
+        Ok(())
+    }
 }
 
 #[async_trait::async_trait]