Skip to content

Commit aae2c53

Browse files
authored
chore: remove local state-machine-api directory (#18395)
* refactor: migrate state-machine-api to external crate - Move src/meta/state-machine-api to standalone external crate - Update all Cargo.toml files to reference external git repository - Replace crate name from databend_common_meta_state_machine_api to state_machine_api - Use tagged version v0.1.0 from https://github.com/databendlabs/state-machine-api.git - Update 28+ Rust files with new import paths - All compilation and lint checks passing External crate details: - Repository: https://github.com/databendlabs/state-machine-api.git - Tag: v0.1.0 - CI: Passing with GitHub Actions - Tests: 22 tests passing * chore: remove local state-machine-api directory - Directory has been successfully migrated to external crate - All references now use external git dependency - Compilation verified to work with external crate only * chore: fix Cargo.toml fmt
1 parent 31678f2 commit aae2c53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+78
-859
lines changed

Cargo.lock

Lines changed: 15 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ members = [
105105
"src/meta/raft-store",
106106
"src/meta/semaphore",
107107
"src/meta/sled-store",
108-
"src/meta/state-machine-api",
109108
"src/meta/stoerr",
110109
"src/meta/store",
111110
"src/meta/types",
@@ -156,7 +155,6 @@ databend-common-meta-process = { path = "src/meta/process" }
156155
databend-common-meta-raft-store = { path = "src/meta/raft-store" }
157156
databend-common-meta-semaphore = { path = "src/meta/semaphore" }
158157
databend-common-meta-sled-store = { path = "src/meta/sled-store" }
159-
databend-common-meta-state-machine-api = { path = "src/meta/state-machine-api" }
160158
databend-common-meta-stoerr = { path = "src/meta/stoerr" }
161159
databend-common-meta-store = { path = "src/meta/store" }
162160
databend-common-meta-types = { path = "src/meta/types" }
@@ -504,6 +502,7 @@ socket2 = "0.5.3"
504502
span-map = { version = "0.2.0" }
505503
sqlx = { version = "0.8", features = ["mysql", "runtime-tokio"] }
506504
state = "0.6.0"
505+
state-machine-api = { version = "0.1.0" }
507506
stream-more = "0.1.3"
508507
strength_reduce = "0.2.4"
509508
stringslice = "0.2.0"
@@ -666,6 +665,7 @@ openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-al
666665
orc-rust = { git = "https://github.com/datafuse-extras/orc-rust", rev = "d82aa6d" }
667666
recursive = { git = "https://github.com/datafuse-extras/recursive.git", rev = "6af35a1" }
668667
sled = { git = "https://github.com/datafuse-extras/sled", tag = "v0.34.7-datafuse.1" }
668+
state-machine-api = { git = "https://github.com/databendlabs/state-machine-api.git", tag = "v0.1.0" }
669669
sub-cache = { git = "https://github.com/databendlabs/sub-cache", tag = "v0.2.1" }
670670
tantivy = { git = "https://github.com/datafuse-extras/tantivy", rev = "7502370" }
671671
tantivy-common = { git = "https://github.com/datafuse-extras/tantivy", rev = "7502370", package = "tantivy-common" }

src/meta/kvapi-test-suite/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ edition = { workspace = true }
1111
[dependencies]
1212
anyhow = { workspace = true }
1313
databend-common-meta-kvapi = { workspace = true }
14-
databend-common-meta-state-machine-api = { workspace = true }
1514
databend-common-meta-types = { workspace = true }
1615
display-more = { workspace = true }
1716
fastrace = { workspace = true }
1817
log = { workspace = true }
18+
state-machine-api = { workspace = true }
1919
tokio = { workspace = true }
2020

2121
[lints]

src/meta/kvapi-test-suite/src/kvapi_test_suite.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use std::time::Duration;
1616
use std::time::SystemTime;
1717

1818
use databend_common_meta_kvapi::kvapi;
19-
use databend_common_meta_state_machine_api::KVMeta;
2019
use databend_common_meta_types::protobuf as pb;
2120
use databend_common_meta_types::protobuf::BooleanExpression;
2221
use databend_common_meta_types::protobuf::FetchAddU64Response;
@@ -50,6 +49,7 @@ use fastrace::func_name;
5049
use fastrace::func_path;
5150
use log::debug;
5251
use log::info;
52+
use state_machine_api::KVMeta;
5353
use tokio::time::sleep;
5454

5555
pub struct TestSuite {}

src/meta/raft-store/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ databend-common-exception = { workspace = true }
1919
databend-common-grpc = { workspace = true }
2020
databend-common-meta-kvapi = { workspace = true }
2121
databend-common-meta-sled-store = { workspace = true }
22-
databend-common-meta-state-machine-api = { workspace = true }
2322
databend-common-meta-stoerr = { workspace = true }
2423
databend-common-meta-types = { workspace = true }
2524
databend-common-version = { workspace = true }
@@ -44,6 +43,7 @@ semver = { workspace = true }
4443
seq-marked = { workspace = true, features = ["seq-marked-serde", "seq-marked-bincode", "seqv-serde"] }
4544
serde = { workspace = true }
4645
serde_json = { workspace = true }
46+
state-machine-api = { workspace = true }
4747
stream-more = { workspace = true }
4848
strum = { workspace = true }
4949
strum_macros = { workspace = true }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use std::future::ready;
1616
use std::io;
1717
use std::time::Duration;
1818

19-
use databend_common_meta_state_machine_api::StateMachineApi;
2019
use databend_common_meta_types::node::Node;
2120
use databend_common_meta_types::protobuf as pb;
2221
use databend_common_meta_types::protobuf::boolean_expression::CombiningOperator;
@@ -61,6 +60,7 @@ use log::info;
6160
use log::warn;
6261
use num::FromPrimitive;
6362
use seq_marked::SeqValue;
63+
use state_machine_api::StateMachineApi;
6464

6565
use crate::state_machine_api_ext::StateMachineApiExt;
6666

src/meta/raft-store/src/key_spaces.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ use databend_common_meta_sled_store::sled;
1919
use databend_common_meta_sled_store::SledKeySpace;
2020
use databend_common_meta_sled_store::SledOrderedSerde;
2121
use databend_common_meta_sled_store::SledSerde;
22-
use databend_common_meta_state_machine_api::ExpireKey;
23-
use databend_common_meta_state_machine_api::ExpireValue;
2422
use databend_common_meta_stoerr::MetaStorageError;
2523
use databend_common_meta_types::node::Node;
2624
use databend_common_meta_types::raft_types::Entry;
@@ -32,6 +30,8 @@ use databend_common_meta_types::SeqNum;
3230
use databend_common_meta_types::SeqV;
3331
use serde::Deserialize;
3432
use serde::Serialize;
33+
use state_machine_api::ExpireKey;
34+
use state_machine_api::ExpireValue;
3535

3636
use crate::ondisk::Header;
3737
use crate::ondisk::OnDisk;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use std::future;
1818
use std::io;
1919

20-
use databend_common_meta_state_machine_api::ExpireValue;
2120
use databend_common_meta_types::snapshot_db::DB;
2221
use databend_common_meta_types::SeqNum;
2322
use databend_common_meta_types::SeqV;
@@ -26,6 +25,7 @@ use futures_util::TryStreamExt;
2625
use log::info;
2726
use map_api::map_api_ro::MapApiRO;
2827
use map_api::IOResultStream;
28+
use state_machine_api::ExpireValue;
2929

3030
use crate::key_spaces::SMEntry;
3131
use crate::leveled_store::db_map_api_ro_impl::MapView;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
//! Test for db_map_api_ro_impl.
1616
17-
use databend_common_meta_state_machine_api::ExpireKey;
18-
use databend_common_meta_state_machine_api::KVMeta;
19-
use databend_common_meta_state_machine_api::UserKey;
2017
use databend_common_meta_types::UpsertKV;
2118
use futures_util::TryStreamExt;
2219
use map_api::map_api_ro::MapApiRO;
2320
use seq_marked::SeqMarked;
21+
use state_machine_api::ExpireKey;
22+
use state_machine_api::KVMeta;
23+
use state_machine_api::UserKey;
2424

2525
use crate::leveled_store::db_builder::DBBuilder;
2626
use crate::leveled_store::db_map_api_ro_impl::MapView;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ use std::sync::atomic::AtomicU64;
2020
use std::sync::atomic::Ordering;
2121
use std::sync::Arc;
2222

23-
use databend_common_meta_state_machine_api::ExpireKey;
24-
use databend_common_meta_state_machine_api::MetaValue;
25-
use databend_common_meta_state_machine_api::UserKey;
2623
use map_api::map_api_ro::MapApiRO;
2724
use seq_marked::SeqMarked;
25+
use state_machine_api::ExpireKey;
26+
use state_machine_api::MetaValue;
27+
use state_machine_api::UserKey;
2828

2929
use crate::leveled_store::level::Level;
3030
use crate::leveled_store::level_index::LevelIndex;

0 commit comments

Comments
 (0)