Skip to content

Commit 8b37c9d

Browse files
drmingdrmerdrmingdrmer
authored
refactor: move StateMachineApi to standalone crate (#18388)
1 parent 513e59f commit 8b37c9d

File tree

94 files changed

+584
-459
lines changed

Some content is hidden

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

94 files changed

+584
-459
lines changed

‎Cargo.lock

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

‎Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ members = [
105105
"src/meta/raft-store",
106106
"src/meta/semaphore",
107107
"src/meta/sled-store",
108+
"src/meta/state-machine-api",
108109
"src/meta/stoerr",
109110
"src/meta/store",
110111
"src/meta/types",
@@ -155,6 +156,7 @@ databend-common-meta-process = { path = "src/meta/process" }
155156
databend-common-meta-raft-store = { path = "src/meta/raft-store" }
156157
databend-common-meta-semaphore = { path = "src/meta/semaphore" }
157158
databend-common-meta-sled-store = { path = "src/meta/sled-store" }
159+
databend-common-meta-state-machine-api = { path = "src/meta/state-machine-api" }
158160
databend-common-meta-stoerr = { path = "src/meta/stoerr" }
159161
databend-common-meta-store = { path = "src/meta/store" }
160162
databend-common-meta-types = { path = "src/meta/types" }
@@ -658,7 +660,7 @@ backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git", rev = "7226
658660
color-eyre = { git = "https://github.com/eyre-rs/eyre.git", rev = "e5d92c3" }
659661
deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "9954bff" }
660662
display-more = { git = "https://github.com/databendlabs/display-more", tag = "v0.2.0" }
661-
map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.2.6" }
663+
map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.2.7" }
662664
openai_api_rust = { git = "https://github.com/datafuse-extras/openai-api", rev = "819a0ed" }
663665
openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-alpha.9" }
664666
orc-rust = { git = "https://github.com/datafuse-extras/orc-rust", rev = "d82aa6d" }

‎src/meta/api/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ logcall = { workspace = true }
3030
maplit = { workspace = true }
3131
prost = { workspace = true }
3232
rand = { workspace = true }
33+
seq-marked = { workspace = true }
3334
serde = { workspace = true }
3435
serde_json = { workspace = true }
3536
thiserror = { workspace = true }

‎src/meta/api/src/crud/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ use databend_common_meta_app::tenant_key::resource::TenantResource;
2828
use databend_common_meta_kvapi::kvapi;
2929
use databend_common_meta_kvapi::kvapi::DirName;
3030
use databend_common_meta_kvapi::kvapi::ValueWithName;
31-
use databend_common_meta_types::seq_value::SeqV;
32-
use databend_common_meta_types::seq_value::SeqValue;
3331
use databend_common_meta_types::MatchSeq;
3432
use databend_common_meta_types::MatchSeqExt;
3533
use databend_common_meta_types::MetaError;
34+
use databend_common_meta_types::SeqV;
3635
use databend_common_meta_types::With;
3736
use databend_common_proto_conv::FromToProto;
3837
pub use errors::CrudError;
3938
use futures::TryStreamExt;
4039
use log::info;
40+
use seq_marked::SeqValue;
4141

4242
use crate::kv_pb_api::KVPbApi;
4343
use crate::kv_pb_api::UpsertPB;

‎src/meta/api/src/kv_pb_api/codec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
use databend_common_meta_kvapi::kvapi;
1616
use databend_common_meta_kvapi::kvapi::NonEmptyItem;
1717
use databend_common_meta_types::protobuf::StreamItem;
18-
use databend_common_meta_types::seq_value::SeqV;
1918
use databend_common_meta_types::Change;
2019
use databend_common_meta_types::Operation;
20+
use databend_common_meta_types::SeqV;
2121
use databend_common_proto_conv::FromToProto;
2222

2323
use crate::kv_pb_api::errors::NoneValue;

‎src/meta/api/src/kv_pb_api/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ use databend_common_meta_kvapi::kvapi::DirName;
2929
use databend_common_meta_kvapi::kvapi::KVApi;
3030
use databend_common_meta_kvapi::kvapi::NonEmptyItem;
3131
use databend_common_meta_types::protobuf::StreamItem;
32-
use databend_common_meta_types::seq_value::SeqV;
3332
use databend_common_meta_types::Change;
34-
use databend_common_meta_types::SeqValue;
33+
use databend_common_meta_types::SeqV;
3534
use databend_common_meta_types::UpsertKV;
3635
use databend_common_proto_conv::FromToProto;
3736
use futures::future::FutureExt;
@@ -41,6 +40,7 @@ use futures::stream::BoxStream;
4140
use futures::stream::StreamExt;
4241
use futures::TryStreamExt;
4342
use itertools::Itertools;
43+
use seq_marked::SeqValue;
4444

4545
pub(crate) use self::codec::decode_non_empty_item;
4646
pub(crate) use self::codec::decode_seqv;
@@ -524,16 +524,16 @@ mod tests {
524524
use databend_common_meta_kvapi::kvapi::KVStream;
525525
use databend_common_meta_kvapi::kvapi::UpsertKVReply;
526526
use databend_common_meta_types::protobuf::StreamItem;
527-
use databend_common_meta_types::seq_value::SeqV;
528-
use databend_common_meta_types::seq_value::SeqValue;
529527
use databend_common_meta_types::MetaError;
528+
use databend_common_meta_types::SeqV;
530529
use databend_common_meta_types::TxnReply;
531530
use databend_common_meta_types::TxnRequest;
532531
use databend_common_meta_types::UpsertKV;
533532
use databend_common_proto_conv::FromToProto;
534533
use futures::StreamExt;
535534
use futures::TryStreamExt;
536535
use prost::Message;
536+
use seq_marked::SeqValue;
537537

538538
use crate::kv_pb_api::KVPbApi;
539539

‎src/meta/api/src/kv_pb_crud_api.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ use databend_common_meta_types::Change;
2020
use databend_common_meta_types::MatchSeq;
2121
use databend_common_meta_types::MetaError;
2222
use databend_common_meta_types::SeqV;
23-
use databend_common_meta_types::SeqValue;
2423
use databend_common_meta_types::TxnRequest;
2524
use databend_common_meta_types::With;
2625
use databend_common_proto_conv::FromToProto;
2726
use fastrace::func_name;
2827
use log::debug;
28+
use seq_marked::SeqValue;
2929

3030
use crate::kv_pb_api::KVPbApi;
3131
use crate::kv_pb_api::UpsertPB;

‎src/meta/api/src/name_id_value_api.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@ mod tests {
399399
use databend_common_meta_kvapi::kvapi::KVStream;
400400
use databend_common_meta_kvapi::kvapi::UpsertKVReply;
401401
use databend_common_meta_types::protobuf::StreamItem;
402-
use databend_common_meta_types::seq_value::SeqV;
403402
use databend_common_meta_types::MetaError;
403+
use databend_common_meta_types::SeqV;
404404
use databend_common_meta_types::TxnReply;
405405
use databend_common_meta_types::TxnRequest;
406406
use databend_common_meta_types::UpsertKV;

‎src/meta/api/src/schema_api.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ use databend_common_meta_app::schema::UpsertTableOptionReply;
9494
use databend_common_meta_app::schema::UpsertTableOptionReq;
9595
use databend_common_meta_app::tenant::Tenant;
9696
use databend_common_meta_kvapi::kvapi;
97-
use databend_common_meta_types::seq_value::SeqV;
9897
use databend_common_meta_types::Change;
9998
use databend_common_meta_types::MetaError;
10099
use databend_common_meta_types::MetaId;
100+
use databend_common_meta_types::SeqV;
101101
use databend_common_proto_conv::FromToProto;
102102

103103
use crate::kv_app_error::KVAppError;

‎src/meta/api/src/schema_api_impl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,14 @@ use databend_common_meta_kvapi::kvapi;
178178
use databend_common_meta_kvapi::kvapi::DirName;
179179
use databend_common_meta_kvapi::kvapi::Key;
180180
use databend_common_meta_types::protobuf as pb;
181-
use databend_common_meta_types::seq_value::SeqV;
182-
use databend_common_meta_types::seq_value::SeqValue;
183181
use databend_common_meta_types::txn_op::Request;
184182
use databend_common_meta_types::txn_op_response::Response;
185183
use databend_common_meta_types::Change;
186184
use databend_common_meta_types::ConditionResult;
187185
use databend_common_meta_types::MatchSeqExt;
188186
use databend_common_meta_types::MetaError;
189187
use databend_common_meta_types::MetaId;
188+
use databend_common_meta_types::SeqV;
190189
use databend_common_meta_types::TxnGetRequest;
191190
use databend_common_meta_types::TxnGetResponse;
192191
use databend_common_meta_types::TxnOp;
@@ -200,6 +199,7 @@ use log::debug;
200199
use log::error;
201200
use log::info;
202201
use log::warn;
202+
use seq_marked::SeqValue;
203203
use ConditionResult::Eq;
204204

205205
use crate::assert_table_exist;

0 commit comments

Comments
 (0)