Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ members = [
"src/meta/raft-store",
"src/meta/semaphore",
"src/meta/sled-store",
"src/meta/state-machine-api",
"src/meta/stoerr",
"src/meta/store",
"src/meta/types",
Expand Down Expand Up @@ -156,7 +155,6 @@ databend-common-meta-process = { path = "src/meta/process" }
databend-common-meta-raft-store = { path = "src/meta/raft-store" }
databend-common-meta-semaphore = { path = "src/meta/semaphore" }
databend-common-meta-sled-store = { path = "src/meta/sled-store" }
databend-common-meta-state-machine-api = { path = "src/meta/state-machine-api" }
databend-common-meta-stoerr = { path = "src/meta/stoerr" }
databend-common-meta-store = { path = "src/meta/store" }
databend-common-meta-types = { path = "src/meta/types" }
Expand Down Expand Up @@ -504,6 +502,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.1.0" }
stream-more = "0.1.3"
strength_reduce = "0.2.4"
stringslice = "0.2.0"
Expand Down Expand Up @@ -666,6 +665,7 @@ openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-al
orc-rust = { git = "https://github.com/datafuse-extras/orc-rust", rev = "d82aa6d" }
recursive = { git = "https://github.com/datafuse-extras/recursive.git", rev = "6af35a1" }
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.1.0" }
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" }
Expand Down
2 changes: 1 addition & 1 deletion src/meta/kvapi-test-suite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ edition = { workspace = true }
[dependencies]
anyhow = { workspace = true }
databend-common-meta-kvapi = { workspace = true }
databend-common-meta-state-machine-api = { workspace = true }
databend-common-meta-types = { workspace = true }
display-more = { workspace = true }
fastrace = { workspace = true }
log = { workspace = true }
state-machine-api = { workspace = true }
tokio = { workspace = true }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion src/meta/kvapi-test-suite/src/kvapi_test_suite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use std::time::Duration;
use std::time::SystemTime;

use databend_common_meta_kvapi::kvapi;
use databend_common_meta_state_machine_api::KVMeta;
use databend_common_meta_types::protobuf as pb;
use databend_common_meta_types::protobuf::BooleanExpression;
use databend_common_meta_types::protobuf::FetchAddU64Response;
Expand Down Expand Up @@ -50,6 +49,7 @@ use fastrace::func_name;
use fastrace::func_path;
use log::debug;
use log::info;
use state_machine_api::KVMeta;
use tokio::time::sleep;

pub struct TestSuite {}
Expand Down
2 changes: 1 addition & 1 deletion src/meta/raft-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ databend-common-exception = { workspace = true }
databend-common-grpc = { workspace = true }
databend-common-meta-kvapi = { workspace = true }
databend-common-meta-sled-store = { workspace = true }
databend-common-meta-state-machine-api = { workspace = true }
databend-common-meta-stoerr = { workspace = true }
databend-common-meta-types = { workspace = true }
databend-common-version = { workspace = true }
Expand All @@ -44,6 +43,7 @@ semver = { workspace = true }
seq-marked = { workspace = true, features = ["seq-marked-serde", "seq-marked-bincode", "seqv-serde"] }
serde = { workspace = true }
serde_json = { workspace = true }
state-machine-api = { workspace = true }
stream-more = { workspace = true }
strum = { workspace = true }
strum_macros = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/meta/raft-store/src/applier/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use std::future::ready;
use std::io;
use std::time::Duration;

use databend_common_meta_state_machine_api::StateMachineApi;
use databend_common_meta_types::node::Node;
use databend_common_meta_types::protobuf as pb;
use databend_common_meta_types::protobuf::boolean_expression::CombiningOperator;
Expand Down Expand Up @@ -61,6 +60,7 @@ use log::info;
use log::warn;
use num::FromPrimitive;
use seq_marked::SeqValue;
use state_machine_api::StateMachineApi;

use crate::state_machine_api_ext::StateMachineApiExt;

Expand Down
4 changes: 2 additions & 2 deletions src/meta/raft-store/src/key_spaces.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ use databend_common_meta_sled_store::sled;
use databend_common_meta_sled_store::SledKeySpace;
use databend_common_meta_sled_store::SledOrderedSerde;
use databend_common_meta_sled_store::SledSerde;
use databend_common_meta_state_machine_api::ExpireKey;
use databend_common_meta_state_machine_api::ExpireValue;
use databend_common_meta_stoerr::MetaStorageError;
use databend_common_meta_types::node::Node;
use databend_common_meta_types::raft_types::Entry;
Expand All @@ -32,6 +30,8 @@ use databend_common_meta_types::SeqNum;
use databend_common_meta_types::SeqV;
use serde::Deserialize;
use serde::Serialize;
use state_machine_api::ExpireKey;
use state_machine_api::ExpireValue;

use crate::ondisk::Header;
use crate::ondisk::OnDisk;
Expand Down
2 changes: 1 addition & 1 deletion src/meta/raft-store/src/leveled_store/db_exporter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use std::future;
use std::io;

use databend_common_meta_state_machine_api::ExpireValue;
use databend_common_meta_types::snapshot_db::DB;
use databend_common_meta_types::SeqNum;
use databend_common_meta_types::SeqV;
Expand All @@ -26,6 +25,7 @@ use futures_util::TryStreamExt;
use log::info;
use map_api::map_api_ro::MapApiRO;
use map_api::IOResultStream;
use state_machine_api::ExpireValue;

use crate::key_spaces::SMEntry;
use crate::leveled_store::db_map_api_ro_impl::MapView;
Expand Down
6 changes: 3 additions & 3 deletions src/meta/raft-store/src/leveled_store/db_map_api_ro_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

//! Test for db_map_api_ro_impl.

use databend_common_meta_state_machine_api::ExpireKey;
use databend_common_meta_state_machine_api::KVMeta;
use databend_common_meta_state_machine_api::UserKey;
use databend_common_meta_types::UpsertKV;
use futures_util::TryStreamExt;
use map_api::map_api_ro::MapApiRO;
use seq_marked::SeqMarked;
use state_machine_api::ExpireKey;
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;
Expand Down
6 changes: 3 additions & 3 deletions src/meta/raft-store/src/leveled_store/immutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ use std::sync::atomic::AtomicU64;
use std::sync::atomic::Ordering;
use std::sync::Arc;

use databend_common_meta_state_machine_api::ExpireKey;
use databend_common_meta_state_machine_api::MetaValue;
use databend_common_meta_state_machine_api::UserKey;
use map_api::map_api_ro::MapApiRO;
use seq_marked::SeqMarked;
use state_machine_api::ExpireKey;
use state_machine_api::MetaValue;
use state_machine_api::UserKey;

use crate::leveled_store::level::Level;
use crate::leveled_store::level_index::LevelIndex;
Expand Down
4 changes: 2 additions & 2 deletions src/meta/raft-store/src/leveled_store/key_spaces_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ use std::fmt;
use std::io;
use std::io::Error;

use databend_common_meta_state_machine_api::ExpireKey;
use databend_common_meta_state_machine_api::UserKey;
use state_machine_api::ExpireKey;
use state_machine_api::UserKey;

use crate::leveled_store::map_api::MapKeyDecode;
use crate::leveled_store::map_api::MapKeyEncode;
Expand Down
6 changes: 3 additions & 3 deletions src/meta/raft-store/src/leveled_store/level.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ use std::collections::BTreeMap;
use std::io;
use std::ops::RangeBounds;

use databend_common_meta_state_machine_api::ExpireKey;
use databend_common_meta_state_machine_api::MetaValue;
use databend_common_meta_state_machine_api::UserKey;
use databend_common_meta_types::sys_data::SysData;
use futures_util::StreamExt;
use log::warn;
Expand All @@ -27,6 +24,9 @@ use map_api::map_api_ro::MapApiRO;
use map_api::map_key::MapKey;
use map_api::BeforeAfter;
use seq_marked::SeqMarked;
use state_machine_api::ExpireKey;
use state_machine_api::MetaValue;
use state_machine_api::UserKey;

use crate::leveled_store::map_api::AsMap;
use crate::leveled_store::map_api::KVResultStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
use std::fmt;
use std::io;

use databend_common_meta_state_machine_api::ExpireKey;
use databend_common_meta_state_machine_api::UserKey;
use databend_common_meta_types::snapshot_db::DB;
use databend_common_meta_types::sys_data::SysData;
use futures_util::future;
Expand All @@ -26,6 +24,8 @@ use map_api::map_api_ro::MapApiRO;
use map_api::IOResultStream;
use map_api::MapKV;
use rotbl::v001::SeqMarked;
use state_machine_api::ExpireKey;
use state_machine_api::UserKey;
use stream_more::KMerge;
use stream_more::StreamMore;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use databend_common_meta_state_machine_api::KVMeta;
use databend_common_meta_state_machine_api::UserKey;
use futures_util::TryStreamExt;
use map_api::map_api::MapApi;
use map_api::map_api_ro::MapApiRO;
use map_api::SeqMarked;
use state_machine_api::KVMeta;
use state_machine_api::UserKey;

use crate::leveled_store::leveled_map::LeveledMap;
use crate::leveled_store::map_api::AsMap;
Expand Down
8 changes: 4 additions & 4 deletions src/meta/raft-store/src/leveled_store/map_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ use std::fmt;
use std::fmt::Write;
use std::io;

use databend_common_meta_state_machine_api::ExpireKey;
use databend_common_meta_state_machine_api::KVMeta;
use databend_common_meta_state_machine_api::MetaValue;
use databend_common_meta_state_machine_api::UserKey;
use map_api::map_api::MapApi;
use map_api::map_api_ro::MapApiRO;
pub use map_api::map_key::MapKey;
pub use map_api::map_value::MapValue;
pub use map_api::BeforeAfter;
pub use map_api::IOResultStream;
use seq_marked::SeqMarked;
use state_machine_api::ExpireKey;
use state_machine_api::KVMeta;
use state_machine_api::MetaValue;
use state_machine_api::UserKey;

pub type MapKeyPrefix = &'static str;

Expand Down
4 changes: 2 additions & 2 deletions src/meta/raft-store/src/leveled_store/rotbl_codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ impl RotblCodec {

#[cfg(test)]
mod tests {
use databend_common_meta_state_machine_api::ExpireKey;
use databend_common_meta_state_machine_api::UserKey;
use state_machine_api::ExpireKey;
use state_machine_api::UserKey;
use Bound::Excluded;
use Bound::Included;

Expand Down
4 changes: 2 additions & 2 deletions src/meta/raft-store/src/leveled_store/rotbl_seq_mark_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

use std::io;

use databend_common_meta_state_machine_api::KVMeta;
use databend_common_meta_state_machine_api::MetaValue;
use rotbl::v001::Marked;
use rotbl::v001::SeqMarked;
use state_machine_api::KVMeta;
use state_machine_api::MetaValue;

use crate::leveled_store::value_convert::ValueConvert;

Expand Down
2 changes: 1 addition & 1 deletion src/meta/raft-store/src/sm_v003/adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ use std::io;
use std::sync::Arc;
use std::sync::Mutex;

use databend_common_meta_state_machine_api::UserKey;
use databend_common_meta_types::raft_types::LogId;
use databend_common_meta_types::raft_types::StoredMembership;
use databend_common_meta_types::sys_data::SysData;
use rotbl::v001::SeqMarked;
use state_machine_api::UserKey;

use crate::key_spaces::SMEntry;
use crate::leveled_store::rotbl_codec::RotblCodec;
Expand Down
Loading
Loading