Skip to content

Commit 444e052

Browse files
authored
refactor: move id-generator from crate meta-api to meta-app (#15036)
meta-app is a crate defines application level meta-service keys and values.
1 parent fec4dab commit 444e052

11 files changed

+18
-89
lines changed

src/meta/api/src/background_api_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ use databend_common_meta_app::background::UpdateBackgroundJobReply;
3838
use databend_common_meta_app::background::UpdateBackgroundJobStatusReq;
3939
use databend_common_meta_app::background::UpdateBackgroundTaskReply;
4040
use databend_common_meta_app::background::UpdateBackgroundTaskReq;
41+
use databend_common_meta_app::id_generator::IdGenerator;
4142
use databend_common_meta_kvapi::kvapi;
4243
use databend_common_meta_kvapi::kvapi::Key;
4344
use databend_common_meta_kvapi::kvapi::UpsertKVReq;
@@ -57,7 +58,6 @@ use crate::deserialize_struct;
5758
use crate::fetch_id;
5859
use crate::get_pb_value;
5960
use crate::get_u64_value;
60-
use crate::id_generator::IdGenerator;
6161
use crate::kv_app_error::KVAppError;
6262
use crate::send_txn;
6363
use crate::serialize_struct;

src/meta/api/src/background_api_keys.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/meta/api/src/data_mask_api_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use databend_common_meta_app::data_mask::GetDatamaskReply;
2828
use databend_common_meta_app::data_mask::GetDatamaskReq;
2929
use databend_common_meta_app::data_mask::MaskpolicyTableIdList;
3030
use databend_common_meta_app::data_mask::MaskpolicyTableIdListKey;
31+
use databend_common_meta_app::id_generator::IdGenerator;
3132
use databend_common_meta_app::schema::CreateOption;
3233
use databend_common_meta_app::schema::TableId;
3334
use databend_common_meta_app::schema::TableMeta;
@@ -44,7 +45,6 @@ use crate::data_mask_api::DatamaskApi;
4445
use crate::fetch_id;
4546
use crate::get_pb_value;
4647
use crate::get_u64_value;
47-
use crate::id_generator::IdGenerator;
4848
use crate::kv_app_error::KVAppError;
4949
use crate::send_txn;
5050
use crate::serialize_struct;

src/meta/api/src/data_mask_api_keys.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/meta/api/src/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,17 @@ extern crate databend_common_meta_types;
2020

2121
mod background_api;
2222
mod background_api_impl;
23-
mod background_api_keys;
2423
mod background_api_test_suite;
2524
mod data_mask_api;
2625
mod data_mask_api_impl;
27-
mod data_mask_api_keys;
28-
mod id_generator;
2926
pub mod kv_app_error;
3027
pub mod kv_pb_api;
3128
pub mod reply;
3229
mod schema_api;
3330
mod schema_api_impl;
34-
mod schema_api_keys;
3531
mod schema_api_test_suite;
3632
mod share_api;
3733
mod share_api_impl;
38-
mod share_api_keys;
3934
mod share_api_test_suite;
4035
pub(crate) mod testing;
4136
pub mod txn_backoff;
@@ -46,7 +41,6 @@ pub mod crud;
4641
pub use background_api::BackgroundApi;
4742
pub use background_api_test_suite::BackgroundApiTestSuite;
4843
pub use data_mask_api::DatamaskApi;
49-
pub use id_generator::IdGenerator;
5044
pub use schema_api::SchemaApi;
5145
pub(crate) use schema_api_impl::get_db_or_err;
5246
pub use schema_api_test_suite::SchemaApiTestSuite;

src/meta/api/src/schema_api_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ use databend_common_meta_app::app_error::WrongShare;
5858
use databend_common_meta_app::app_error::WrongShareObject;
5959
use databend_common_meta_app::data_mask::MaskpolicyTableIdList;
6060
use databend_common_meta_app::data_mask::MaskpolicyTableIdListKey;
61+
use databend_common_meta_app::id_generator::IdGenerator;
6162
use databend_common_meta_app::schema::CatalogId;
6263
use databend_common_meta_app::schema::CatalogIdToName;
6364
use databend_common_meta_app::schema::CatalogInfo;
@@ -243,7 +244,6 @@ use crate::util::list_tables_from_share_db;
243244
use crate::util::list_tables_from_unshare_db;
244245
use crate::util::mget_pb_values;
245246
use crate::util::remove_table_from_share;
246-
use crate::IdGenerator;
247247
use crate::SchemaApi;
248248
use crate::DEFAULT_MGET_SIZE;
249249

src/meta/api/src/schema_api_keys.rs

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/meta/api/src/share_api_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ use databend_common_meta_app::app_error::UnknownShareAccounts;
2424
use databend_common_meta_app::app_error::UnknownTable;
2525
use databend_common_meta_app::app_error::WrongShare;
2626
use databend_common_meta_app::app_error::WrongShareObject;
27+
use databend_common_meta_app::id_generator::IdGenerator;
2728
use databend_common_meta_app::schema::CreateOption;
2829
use databend_common_meta_app::schema::DBIdTableName;
2930
use databend_common_meta_app::schema::DatabaseId;
@@ -58,7 +59,6 @@ use crate::get_share_meta_by_id_or_err;
5859
use crate::get_share_or_err;
5960
use crate::get_share_table_info;
6061
use crate::get_u64_value;
61-
use crate::id_generator::IdGenerator;
6262
use crate::kv_app_error::KVAppError;
6363
use crate::list_keys;
6464
use crate::send_txn;

src/meta/api/src/share_api_keys.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/meta/api/src/id_generator.rs renamed to src/meta/app/src/id_generator.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,18 @@ use std::convert::Infallible;
1616

1717
use databend_common_meta_kvapi::kvapi;
1818

19-
use crate::background_api_keys::ID_GEN_BACKGROUND_JOB;
20-
use crate::data_mask_api_keys::ID_GEN_DATA_MASK;
21-
use crate::schema_api_keys::ID_GEN_CATALOG;
22-
use crate::schema_api_keys::ID_GEN_DATABASE;
23-
use crate::schema_api_keys::ID_GEN_INDEX;
24-
use crate::schema_api_keys::ID_GEN_TABLE;
25-
use crate::schema_api_keys::ID_GEN_TABLE_LOCK;
26-
use crate::share_api_keys::ID_GEN_SHARE;
27-
use crate::share_api_keys::ID_GEN_SHARE_ENDPOINT;
19+
pub(crate) const ID_GEN_TABLE: &str = "table_id";
20+
pub(crate) const ID_GEN_DATABASE: &str = "database_id";
21+
pub(crate) const ID_GEN_TABLE_LOCK: &str = "table_lock_id";
22+
pub(crate) const ID_GEN_INDEX: &str = "index_id";
23+
24+
pub(crate) const ID_GEN_CATALOG: &str = "catalog_id";
25+
26+
pub(crate) const ID_GEN_SHARE: &str = "share_id";
27+
pub(crate) const ID_GEN_SHARE_ENDPOINT: &str = "share_endpoint_id";
28+
29+
pub(crate) const ID_GEN_DATA_MASK: &str = "data_mask";
30+
pub(crate) const ID_GEN_BACKGROUND_JOB: &str = "background_job";
2831

2932
/// Key for resource id generator
3033
///

0 commit comments

Comments
 (0)