refactor: move MatchSeq to external crate map-api (#17610)

* Add new crate databend-common-meta-app-types, defining the types used by
meta-service application, that depend on meta-service but meta-service
does not depend on them.

move NonEmptyString to app-types crate.

remove unused DATABEND_COMMIT_VERSION from meta-types crate.

Extract `Node` from mod `cluster` to mod `node`.

* refactor: move MatchSeq to external crate map-api

Author: drmingdrmer

Cargo.lock

@@ -91,6 +91,7 @@ members = [
     "src/query/ee",
     "src/meta/api",
     "src/meta/app",
+    "src/meta/app-types",
     "src/meta/binaries",
     "src/meta/client",
     "src/meta/control",
@@ -138,6 +139,7 @@ databend-common-license = { path = "src/common/license" }
 databend-common-management = { path = "src/query/management" }
 databend-common-meta-api = { path = "src/meta/api" }
 databend-common-meta-app = { path = "src/meta/app" }
+databend-common-meta-app-types = { path = "src/meta/app-types" }
 databend-common-meta-client = { path = "src/meta/client" }
 databend-common-meta-control = { path = "src/meta/control" }
 databend-common-meta-embedded = { path = "src/meta/embedded" }
@@ -355,7 +357,7 @@ logforth = { version = "0.14", features = [
     'fastrace',
 ] }
 lz4 = "1.24.0"
-map-api = { version = "0.2.1" }
+map-api = { version = "0.2.3" }
 maplit = "1.0.2"
 match-template = "0.0.1"
 md-5 = "0.10.5"
@@ -632,7 +634,7 @@ 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 = "c149502" }
 ethnum = { git = "https://github.com/datafuse-extras/ethnum-rs", rev = "4cb05f1" }
-map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.2.1" }
+map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.2.3" }
 openai_api_rust = { git = "https://github.com/datafuse-extras/openai-api", rev = "819a0ed" }
 openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-alpha.7" }
 orc-rust = { git = "https://github.com/youngsofun/orc-rust", rev = "94ab8e9" }

Cargo.toml

@@ -42,8 +42,8 @@ use databend_common_meta_app::KeyWithTenant;
 use databend_common_meta_kvapi::kvapi;
 use databend_common_meta_kvapi::kvapi::DirName;
 use databend_common_meta_kvapi::kvapi::Key;
+use databend_common_meta_types::match_seq::MatchSeq::Any;
 use databend_common_meta_types::seq_value::SeqValue;
-use databend_common_meta_types::MatchSeq::Any;
 use databend_common_meta_types::MetaError;
 use databend_common_meta_types::MetaSpec;
 use databend_common_meta_types::Operation;

src/meta/api/src/background_api_impl.rs

@@ -2242,7 +2242,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
                     UnknownTableId::new(req.0.table_id, "update_multi_table_meta"),
                 )));
             }
-            if req_seq.match_seq(*tb_meta_seq).is_err() {
+            if req_seq.match_seq(tb_meta_seq).is_err() {
                 mismatched_tbs.push((
                     req.0.table_id,
                     *tb_meta_seq,
@@ -2356,7 +2356,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
                 )));
             }
 
-            if req.seq.match_seq(stream_meta_seq).is_err() {
+            if req.seq.match_seq(&stream_meta_seq).is_err() {
                 return Err(KVAppError::AppError(AppError::from(
                     StreamVersionMismatched::new(
                         req.stream_id,
@@ -2403,7 +2403,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
             };
 
             // check table version
-            if req.0.seq.match_seq(tb_meta_seq).is_err() {
+            if req.0.seq.match_seq(&tb_meta_seq).is_err() {
                 mismatched_tbs.push((req.0.table_id, tb_meta_seq, table_meta));
             }
         }
@@ -2445,7 +2445,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
                 )));
             };
 
-            if req_seq.match_seq(seq_meta.seq).is_err() {
+            if req_seq.match_seq(&seq_meta.seq).is_err() {
                 return Err(KVAppError::AppError(AppError::from(
                     TableVersionMismatched::new(
                         req.table_id,

src/meta/api/src/schema_api_impl.rs

@@ -0,0 +1,25 @@
+[package]
+name = "databend-common-meta-app-types"
+version = { workspace = true }
+authors = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+edition = { workspace = true }
+
+[lib]
+doctest = false
+test = true
+
+[dependencies]
+num-derive = { workspace = true }
+prost = { workspace = true }
+serde = { workspace = true }
+
+[dev-dependencies]
+anyhow = { workspace = true }
+
+[package.metadata.cargo-machete]
+ignored = ["num-derive", "prost"]
+
+[lints]
+workspace = true

src/meta/app-types/Cargo.toml

@@ -0,0 +1,2 @@
+Defines types used by meta-service applications.
+In other words, these types depend on the meta-service but meta-service does not depend on them.

src/meta/app-types/README.md

@@ -12,13 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use serde::Deserialize;
-use serde::Serialize;
-
-use crate::MatchSeq;
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, thiserror::Error)]
-pub enum ConflictSeq {
-    #[error("ConflictSeq: Want: {want}, Got: {got}")]
-    NotMatch { want: MatchSeq, got: u64 },
-}
+pub mod non_empty;

src/meta/types/src/seq_errors.rs src/meta/app-types/src/lib.rssrc/meta/types/src/seq_errors.rs renamed to src/meta/app-types/src/lib.rs

@@ -23,6 +23,7 @@ databend-common-base = { workspace = true }
 databend-common-exception = { workspace = true }
 databend-common-expression = { workspace = true }
 databend-common-io = { workspace = true }
+databend-common-meta-app-types = { workspace = true }
 databend-common-meta-kvapi = { workspace = true }
 databend-common-meta-types = { workspace = true }
 derive_more = { workspace = true }

src/meta/types/src/non_empty.rs src/meta/app-types/src/non_empty.rssrc/meta/types/src/non_empty.rs renamed to src/meta/app-types/src/non_empty.rs

@@ -17,7 +17,7 @@
 
 use std::fmt::Display;
 
-use databend_common_meta_types::NonEmptyString;
+use databend_common_meta_app_types::non_empty::NonEmptyString;
 
 use crate::app_error::TenantIsEmpty;