From ed9a322247df3043fb8f997a7c39c6a1b3f7cde3 Mon Sep 17 00:00:00 2001 From: lichuang Date: Tue, 1 Nov 2022 14:35:22 +0800 Subject: [PATCH 01/10] feat: add meta_type config --- src/binaries/query/main.rs | 4 ++-- src/query/config/src/inner.rs | 13 +++++++++++ src/query/config/src/lib.rs | 1 + src/query/config/src/outer_v0.rs | 38 ++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/src/binaries/query/main.rs b/src/binaries/query/main.rs index 823823cdb54d8..2f39cb6a5e261 100644 --- a/src/binaries/query/main.rs +++ b/src/binaries/query/main.rs @@ -47,7 +47,7 @@ async fn main(_global_tracker: Arc) -> common_exception::Result< init_default_metrics_recorder(); set_panic_hook(); - if conf.meta.address.is_empty() && conf.meta.endpoints.is_empty() { + if conf.meta.is_embedded_meta()? { MetaEmbedded::init_global_meta_store(conf.meta.embedded_dir.clone()).await?; } // Make sure gloabl services have been inited. @@ -178,7 +178,7 @@ async fn main(_global_tracker: Arc) -> common_exception::Result< println!(" Stderr: {}", conf.log.stderr); println!( "Meta: {}", - if conf.meta.address.is_empty() && conf.meta.endpoints.is_empty() { + if conf.meta.is_embedded_meta()? { format!("embedded at {}", conf.meta.embedded_dir) } else if !conf.meta.endpoints.is_empty() { format!("connected to endpoints {:#?}", conf.meta.endpoints) diff --git a/src/query/config/src/inner.rs b/src/query/config/src/inner.rs index fcc1e4bf15b91..8a2e19614fbb9 100644 --- a/src/query/config/src/inner.rs +++ b/src/query/config/src/inner.rs @@ -29,6 +29,7 @@ use common_tracing::Config as LogConfig; use common_users::idm_config::IDMConfig; use super::outer_v0::Config as OuterV0Config; +use super::outer_v0::MetaType; /// Inner config for query. /// @@ -275,6 +276,7 @@ pub struct MetaConfig { /// Certificate for client to identify meta rpc serve pub rpc_tls_meta_server_root_ca_cert: String, pub rpc_tls_meta_service_domain_name: String, + pub meta_type: String, } impl Default for MetaConfig { @@ -289,11 +291,22 @@ impl Default for MetaConfig { auto_sync_interval: 10, rpc_tls_meta_server_root_ca_cert: "".to_string(), rpc_tls_meta_service_domain_name: "localhost".to_string(), + meta_type: MetaType::Remote.to_str().to_string(), } } } impl MetaConfig { + pub fn is_embedded_meta(&self) -> Result { + let t = MetaType::from_str(&self.meta_type)?; + if t == MetaType::Embedded && self.embedded_dir.is_empty() { + return Err(ErrorCode::InvalidConfig( + "Embedded Meta but embedded_dir is empty", + )); + } + Ok(t == MetaType::Embedded) + } + pub fn is_tls_enabled(&self) -> bool { !self.rpc_tls_meta_server_root_ca_cert.is_empty() && !self.rpc_tls_meta_service_domain_name.is_empty() diff --git a/src/query/config/src/lib.rs b/src/query/config/src/lib.rs index 58d3efc49d420..89392579f4bb0 100644 --- a/src/query/config/src/lib.rs +++ b/src/query/config/src/lib.rs @@ -29,5 +29,6 @@ mod version; pub use inner::Config; pub use inner::QueryConfig; +pub use outer_v0::MetaType; pub use version::DATABEND_COMMIT_VERSION; pub use version::QUERY_SEMVER; diff --git a/src/query/config/src/outer_v0.rs b/src/query/config/src/outer_v0.rs index b65cca744bd5b..9ab513960568c 100644 --- a/src/query/config/src/outer_v0.rs +++ b/src/query/config/src/outer_v0.rs @@ -1258,6 +1258,36 @@ impl From for HiveCatalogConfig { } } +#[derive(Debug, PartialEq, Eq)] +pub enum MetaType { + Remote, + Embedded, +} + +impl MetaType { + pub fn to_str(&self) -> &str { + match self { + Self::Remote => "remote", + Self::Embedded => "embedded", + } + } +} + +impl FromStr for MetaType { + type Err = ErrorCode; + + fn from_str(s: &str) -> Result { + let s = s.to_lowercase(); + match s.as_str() { + "remote" => Ok(Self::Remote), + "embedded" => Ok(Self::Embedded), + _ => Err(ErrorCode::InvalidConfig(String::from( + "invalid MetaType, MUST be 'remote' or 'embedded'", + ))), + } + } +} + /// Meta config group. /// TODO(xuanwo): All meta_xxx should be rename to xxx. #[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Args)] @@ -1306,6 +1336,11 @@ pub struct MetaConfig { #[clap(long = "meta-rpc-tls-meta-service-domain-name", default_value_t)] pub rpc_tls_meta_service_domain_name: String, + + /// MetaStore type: remote or embedded + #[clap(long = "meta-type", default_value = MetaType::Remote.to_str())] + #[serde(alias = "meta_type")] + pub meta_type: String, } impl Default for MetaConfig { @@ -1328,6 +1363,7 @@ impl TryInto for MetaConfig { auto_sync_interval: self.auto_sync_interval, rpc_tls_meta_server_root_ca_cert: self.rpc_tls_meta_server_root_ca_cert, rpc_tls_meta_service_domain_name: self.rpc_tls_meta_service_domain_name, + meta_type: self.meta_type, }) } } @@ -1344,6 +1380,7 @@ impl From for MetaConfig { auto_sync_interval: inner.auto_sync_interval, rpc_tls_meta_server_root_ca_cert: inner.rpc_tls_meta_server_root_ca_cert, rpc_tls_meta_service_domain_name: inner.rpc_tls_meta_service_domain_name, + meta_type: inner.meta_type, } } } @@ -1366,6 +1403,7 @@ impl Debug for MetaConfig { "rpc_tls_meta_service_domain_name", &self.rpc_tls_meta_service_domain_name, ) + .field("meta_type", &self.meta_type) .finish() } } From 9042f664b1dd2b743163a25888b1727586ea691a Mon Sep 17 00:00:00 2001 From: lichuang Date: Wed, 2 Nov 2022 11:59:02 +0800 Subject: [PATCH 02/10] refacor source by comment --- Cargo.lock | 1 + src/query/config/Cargo.toml | 1 + src/query/config/src/inner.rs | 9 ++---- src/query/config/src/outer_v0.rs | 47 +++++++++++--------------------- 4 files changed, 20 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f4b8e0e94ebb..dd3d27bb22e7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1293,6 +1293,7 @@ dependencies = [ "once_cell", "semver 1.0.14", "serde", + "serde_json", "serfig", "thrift 0.17.0", ] diff --git a/src/query/config/Cargo.toml b/src/query/config/Cargo.toml index f447c5dce1f2f..51ff4f73558d6 100644 --- a/src/query/config/Cargo.toml +++ b/src/query/config/Cargo.toml @@ -33,6 +33,7 @@ hex = "0.4.3" once_cell = "1.15.0" semver = "1.0.14" serde = { workspace = true } +serde_json = { workspace = true } serfig = "0.0.3" [build-dependencies] diff --git a/src/query/config/src/inner.rs b/src/query/config/src/inner.rs index 8a2e19614fbb9..4aa9451b37e14 100644 --- a/src/query/config/src/inner.rs +++ b/src/query/config/src/inner.rs @@ -291,19 +291,14 @@ impl Default for MetaConfig { auto_sync_interval: 10, rpc_tls_meta_server_root_ca_cert: "".to_string(), rpc_tls_meta_service_domain_name: "localhost".to_string(), - meta_type: MetaType::Remote.to_str().to_string(), + meta_type: serde_json::to_string(&MetaType::Embedded).unwrap(), } } } impl MetaConfig { pub fn is_embedded_meta(&self) -> Result { - let t = MetaType::from_str(&self.meta_type)?; - if t == MetaType::Embedded && self.embedded_dir.is_empty() { - return Err(ErrorCode::InvalidConfig( - "Embedded Meta but embedded_dir is empty", - )); - } + let t: MetaType = serde_json::from_str(&self.meta_type)?; Ok(t == MetaType::Embedded) } diff --git a/src/query/config/src/outer_v0.rs b/src/query/config/src/outer_v0.rs index 9ab513960568c..bb09f55d6f29b 100644 --- a/src/query/config/src/outer_v0.rs +++ b/src/query/config/src/outer_v0.rs @@ -1258,34 +1258,13 @@ impl From for HiveCatalogConfig { } } -#[derive(Debug, PartialEq, Eq)] +#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Eq)] pub enum MetaType { + #[serde(rename = "remote")] Remote, - Embedded, -} - -impl MetaType { - pub fn to_str(&self) -> &str { - match self { - Self::Remote => "remote", - Self::Embedded => "embedded", - } - } -} -impl FromStr for MetaType { - type Err = ErrorCode; - - fn from_str(s: &str) -> Result { - let s = s.to_lowercase(); - match s.as_str() { - "remote" => Ok(Self::Remote), - "embedded" => Ok(Self::Embedded), - _ => Err(ErrorCode::InvalidConfig(String::from( - "invalid MetaType, MUST be 'remote' or 'embedded'", - ))), - } - } + #[serde(rename = "embedded")] + Embedded, } /// Meta config group. @@ -1293,6 +1272,11 @@ impl FromStr for MetaType { #[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Args)] #[serde(default)] pub struct MetaConfig { + /// MetaStore type: remote or embedded + #[clap(long = "meta-type", default_value = "embedded")] + #[serde(alias = "meta_type")] + pub meta_type: String, + /// The dir to store persisted meta state for a embedded meta store #[clap( long = "meta-embedded-dir", @@ -1336,11 +1320,6 @@ pub struct MetaConfig { #[clap(long = "meta-rpc-tls-meta-service-domain-name", default_value_t)] pub rpc_tls_meta_service_domain_name: String, - - /// MetaStore type: remote or embedded - #[clap(long = "meta-type", default_value = MetaType::Remote.to_str())] - #[serde(alias = "meta_type")] - pub meta_type: String, } impl Default for MetaConfig { @@ -1353,6 +1332,12 @@ impl TryInto for MetaConfig { type Error = ErrorCode; fn try_into(self) -> Result { + let t: MetaType = serde_json::from_str(&self.meta_type)?; + if t == MetaType::Embedded && self.embedded_dir.is_empty() { + return Err(ErrorCode::InvalidConfig( + "Embedded Meta but embedded_dir is empty", + )); + } Ok(InnerMetaConfig { embedded_dir: self.embedded_dir, address: self.address, @@ -1388,6 +1373,7 @@ impl From for MetaConfig { impl Debug for MetaConfig { fn fmt(&self, f: &mut Formatter) -> fmt::Result { f.debug_struct("MetaConfig") + .field("meta_type", &self.meta_type) .field("address", &self.address) .field("endpoints", &self.endpoints) .field("username", &self.username) @@ -1403,7 +1389,6 @@ impl Debug for MetaConfig { "rpc_tls_meta_service_domain_name", &self.rpc_tls_meta_service_domain_name, ) - .field("meta_type", &self.meta_type) .finish() } } From 79b1d427a743f2602b0ee34867da1df7260c0b7e Mon Sep 17 00:00:00 2001 From: lichuang Date: Wed, 2 Nov 2022 16:16:21 +0800 Subject: [PATCH 03/10] refacor source by comment --- Cargo.lock | 2 ++ src/query/config/Cargo.toml | 2 ++ src/query/config/src/inner.rs | 10 ++++++- src/query/config/src/outer_v0.rs | 47 +++++++++++++++++++++++++------- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a53470db7db9..05a2613eb1cec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1295,6 +1295,8 @@ dependencies = [ "serde", "serde_json", "serfig", + "strum", + "strum_macros", "thrift 0.17.0", ] diff --git a/src/query/config/Cargo.toml b/src/query/config/Cargo.toml index 51ff4f73558d6..20e2e6e44b141 100644 --- a/src/query/config/Cargo.toml +++ b/src/query/config/Cargo.toml @@ -35,6 +35,8 @@ semver = "1.0.14" serde = { workspace = true } serde_json = { workspace = true } serfig = "0.0.3" +strum = "0.24.1" +strum_macros = "0.24.1" [build-dependencies] common-building = { path = "../../common/building" } diff --git a/src/query/config/src/inner.rs b/src/query/config/src/inner.rs index 4aa9451b37e14..292e003cc7c74 100644 --- a/src/query/config/src/inner.rs +++ b/src/query/config/src/inner.rs @@ -298,7 +298,15 @@ impl Default for MetaConfig { impl MetaConfig { pub fn is_embedded_meta(&self) -> Result { - let t: MetaType = serde_json::from_str(&self.meta_type)?; + let t = match MetaType::from_str(&self.meta_type) { + Err(_) => { + return Err(ErrorCode::InvalidConfig(format!( + "Invalid MetaType: {}", + self.meta_type + ))); + } + Ok(t) => t, + }; Ok(t == MetaType::Embedded) } diff --git a/src/query/config/src/outer_v0.rs b/src/query/config/src/outer_v0.rs index bb09f55d6f29b..0f6e05acf2de6 100644 --- a/src/query/config/src/outer_v0.rs +++ b/src/query/config/src/outer_v0.rs @@ -1258,12 +1258,11 @@ impl From for HiveCatalogConfig { } } -#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Eq)] +#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Eq, strum_macros::EnumString)] +#[strum(serialize_all = "camelCase")] pub enum MetaType { - #[serde(rename = "remote")] Remote, - #[serde(rename = "embedded")] Embedded, } @@ -1274,7 +1273,7 @@ pub enum MetaType { pub struct MetaConfig { /// MetaStore type: remote or embedded #[clap(long = "meta-type", default_value = "embedded")] - #[serde(alias = "meta_type")] + #[serde(rename = "type")] pub meta_type: String, /// The dir to store persisted meta state for a embedded meta store @@ -1322,6 +1321,38 @@ pub struct MetaConfig { pub rpc_tls_meta_service_domain_name: String, } +impl MetaConfig { + fn check_config(&self) -> Result<()> { + let t = match MetaType::from_str(&self.meta_type) { + Err(_) => { + return Err(ErrorCode::InvalidConfig(format!( + "Invalid MetaType: {}", + self.meta_type + ))); + } + Ok(t) => t, + }; + match t { + MetaType::Embedded => { + if self.embedded_dir.is_empty() { + return Err(ErrorCode::InvalidConfig( + "Embedded Meta but embedded_dir is empty", + )); + } + } + MetaType::Remote => { + if self.address.is_empty() && self.endpoints.is_empty() { + return Err(ErrorCode::InvalidConfig( + "Remote Meta but address and enpoints are empty", + )); + } + } + }; + + Ok(()) + } +} + impl Default for MetaConfig { fn default() -> Self { InnerMetaConfig::default().into() @@ -1332,12 +1363,8 @@ impl TryInto for MetaConfig { type Error = ErrorCode; fn try_into(self) -> Result { - let t: MetaType = serde_json::from_str(&self.meta_type)?; - if t == MetaType::Embedded && self.embedded_dir.is_empty() { - return Err(ErrorCode::InvalidConfig( - "Embedded Meta but embedded_dir is empty", - )); - } + self.check_config()?; + Ok(InnerMetaConfig { embedded_dir: self.embedded_dir, address: self.address, From 37a2269e5d19e52e9692073a7d2c9c4d168cb2f7 Mon Sep 17 00:00:00 2001 From: lichuang Date: Wed, 2 Nov 2022 16:42:58 +0800 Subject: [PATCH 04/10] refacor source by comment --- src/query/config/src/inner.rs | 2 +- src/query/config/src/outer_v0.rs | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/query/config/src/inner.rs b/src/query/config/src/inner.rs index 292e003cc7c74..0074b7c8a0e44 100644 --- a/src/query/config/src/inner.rs +++ b/src/query/config/src/inner.rs @@ -291,7 +291,7 @@ impl Default for MetaConfig { auto_sync_interval: 10, rpc_tls_meta_server_root_ca_cert: "".to_string(), rpc_tls_meta_service_domain_name: "localhost".to_string(), - meta_type: serde_json::to_string(&MetaType::Embedded).unwrap(), + meta_type: MetaType::Embedded.to_string(), } } } diff --git a/src/query/config/src/outer_v0.rs b/src/query/config/src/outer_v0.rs index 0f6e05acf2de6..a65e3e3fd1b4f 100644 --- a/src/query/config/src/outer_v0.rs +++ b/src/query/config/src/outer_v0.rs @@ -1258,7 +1258,15 @@ impl From for HiveCatalogConfig { } } -#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Eq, strum_macros::EnumString)] +#[derive( + serde::Serialize, + serde::Deserialize, + Debug, + PartialEq, + Eq, + strum_macros::EnumString, + strum_macros::Display, +)] #[strum(serialize_all = "camelCase")] pub enum MetaType { Remote, From 5df96dc40c8dfe18d6b65e34aeb24711d1328aed Mon Sep 17 00:00:00 2001 From: lichuang Date: Wed, 2 Nov 2022 18:19:54 +0800 Subject: [PATCH 05/10] refacor source by comment --- src/query/config/src/inner.rs | 37 ++++++++++++++++++----------- src/query/config/src/lib.rs | 2 +- src/query/config/src/outer_v0.rs | 40 ++++++++++++++------------------ 3 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/query/config/src/inner.rs b/src/query/config/src/inner.rs index 0074b7c8a0e44..83e961bbd863a 100644 --- a/src/query/config/src/inner.rs +++ b/src/query/config/src/inner.rs @@ -29,7 +29,6 @@ use common_tracing::Config as LogConfig; use common_users::idm_config::IDMConfig; use super::outer_v0::Config as OuterV0Config; -use super::outer_v0::MetaType; /// Inner config for query. /// @@ -257,6 +256,27 @@ impl Default for HiveCatalogConfig { } } +#[derive( + serde::Serialize, + serde::Deserialize, + Debug, + PartialEq, + Eq, + Clone, + strum_macros::EnumString, + strum_macros::Display, +)] +#[strum(serialize_all = "camelCase")] +pub enum MetaType { + Remote, + + Embedded, + + // Fallback is used for forward compatbility, that is: + // First check embedded config, then endpoints, finally address. + Fallback, +} + #[derive(Clone, PartialEq, Eq)] pub struct MetaConfig { /// The dir to store persisted meta state for a embedded meta store @@ -276,7 +296,7 @@ pub struct MetaConfig { /// Certificate for client to identify meta rpc serve pub rpc_tls_meta_server_root_ca_cert: String, pub rpc_tls_meta_service_domain_name: String, - pub meta_type: String, + pub meta_type: MetaType, } impl Default for MetaConfig { @@ -291,23 +311,14 @@ impl Default for MetaConfig { auto_sync_interval: 10, rpc_tls_meta_server_root_ca_cert: "".to_string(), rpc_tls_meta_service_domain_name: "localhost".to_string(), - meta_type: MetaType::Embedded.to_string(), + meta_type: MetaType::Fallback, } } } impl MetaConfig { pub fn is_embedded_meta(&self) -> Result { - let t = match MetaType::from_str(&self.meta_type) { - Err(_) => { - return Err(ErrorCode::InvalidConfig(format!( - "Invalid MetaType: {}", - self.meta_type - ))); - } - Ok(t) => t, - }; - Ok(t == MetaType::Embedded) + Ok(self.meta_type == MetaType::Embedded) } pub fn is_tls_enabled(&self) -> bool { diff --git a/src/query/config/src/lib.rs b/src/query/config/src/lib.rs index 89392579f4bb0..40c06987e8793 100644 --- a/src/query/config/src/lib.rs +++ b/src/query/config/src/lib.rs @@ -28,7 +28,7 @@ mod outer_v0; mod version; pub use inner::Config; +pub use inner::MetaType; pub use inner::QueryConfig; -pub use outer_v0::MetaType; pub use version::DATABEND_COMMIT_VERSION; pub use version::QUERY_SEMVER; diff --git a/src/query/config/src/outer_v0.rs b/src/query/config/src/outer_v0.rs index a65e3e3fd1b4f..8fbde570e3cbe 100644 --- a/src/query/config/src/outer_v0.rs +++ b/src/query/config/src/outer_v0.rs @@ -49,6 +49,7 @@ use serfig::parsers::Toml; use super::inner::Config as InnerConfig; use super::inner::HiveCatalogConfig as InnerHiveCatalogConfig; use super::inner::MetaConfig as InnerMetaConfig; +use super::inner::MetaType; use super::inner::QueryConfig as InnerQueryConfig; use crate::DATABEND_COMMIT_VERSION; @@ -1258,29 +1259,13 @@ impl From for HiveCatalogConfig { } } -#[derive( - serde::Serialize, - serde::Deserialize, - Debug, - PartialEq, - Eq, - strum_macros::EnumString, - strum_macros::Display, -)] -#[strum(serialize_all = "camelCase")] -pub enum MetaType { - Remote, - - Embedded, -} - /// Meta config group. /// TODO(xuanwo): All meta_xxx should be rename to xxx. #[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Args)] #[serde(default)] pub struct MetaConfig { - /// MetaStore type: remote or embedded - #[clap(long = "meta-type", default_value = "embedded")] + /// MetaStore type: remote, embedded, fallback + #[clap(long = "meta-type", default_value = "fallback")] #[serde(rename = "type")] pub meta_type: String, @@ -1330,7 +1315,7 @@ pub struct MetaConfig { } impl MetaConfig { - fn check_config(&self) -> Result<()> { + fn check_config(&mut self) -> Result<()> { let t = match MetaType::from_str(&self.meta_type) { Err(_) => { return Err(ErrorCode::InvalidConfig(format!( @@ -1340,6 +1325,16 @@ impl MetaConfig { } Ok(t) => t, }; + + // Fallback is used for forward compatbility, that is: + // First check embedded config, then endpoints, finally address. + if t == MetaType::Fallback { + if !self.embedded_dir.is_empty() && self.endpoints.is_empty() { + self.meta_type = MetaType::Embedded.to_string(); + } else { + self.meta_type = MetaType::Remote.to_string(); + } + } match t { MetaType::Embedded => { if self.embedded_dir.is_empty() { @@ -1355,6 +1350,7 @@ impl MetaConfig { )); } } + _ => {} }; Ok(()) @@ -1370,7 +1366,7 @@ impl Default for MetaConfig { impl TryInto for MetaConfig { type Error = ErrorCode; - fn try_into(self) -> Result { + fn try_into(mut self) -> Result { self.check_config()?; Ok(InnerMetaConfig { @@ -1383,7 +1379,7 @@ impl TryInto for MetaConfig { auto_sync_interval: self.auto_sync_interval, rpc_tls_meta_server_root_ca_cert: self.rpc_tls_meta_server_root_ca_cert, rpc_tls_meta_service_domain_name: self.rpc_tls_meta_service_domain_name, - meta_type: self.meta_type, + meta_type: MetaType::from_str(&self.meta_type).unwrap(), }) } } @@ -1400,7 +1396,7 @@ impl From for MetaConfig { auto_sync_interval: inner.auto_sync_interval, rpc_tls_meta_server_root_ca_cert: inner.rpc_tls_meta_server_root_ca_cert, rpc_tls_meta_service_domain_name: inner.rpc_tls_meta_service_domain_name, - meta_type: inner.meta_type, + meta_type: inner.meta_type.to_string(), } } } From 8620fd718aa9f317380d7b8f1eb3e01461de6cf4 Mon Sep 17 00:00:00 2001 From: lichuang Date: Wed, 2 Nov 2022 18:24:45 +0800 Subject: [PATCH 06/10] remove unused crate --- Cargo.lock | 1 - src/query/config/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05a2613eb1cec..3335a8e572806 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1293,7 +1293,6 @@ dependencies = [ "once_cell", "semver 1.0.14", "serde", - "serde_json", "serfig", "strum", "strum_macros", diff --git a/src/query/config/Cargo.toml b/src/query/config/Cargo.toml index 20e2e6e44b141..961d4554a73e9 100644 --- a/src/query/config/Cargo.toml +++ b/src/query/config/Cargo.toml @@ -33,7 +33,6 @@ hex = "0.4.3" once_cell = "1.15.0" semver = "1.0.14" serde = { workspace = true } -serde_json = { workspace = true } serfig = "0.0.3" strum = "0.24.1" strum_macros = "0.24.1" From c1aa74125944d04dde6296ac80619edb95b82394 Mon Sep 17 00:00:00 2001 From: lichuang Date: Wed, 2 Nov 2022 18:37:43 +0800 Subject: [PATCH 07/10] remove unused crate --- Cargo.lock | 2 -- src/query/formats/Cargo.toml | 2 -- 2 files changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3335a8e572806..56feb129e3270 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1402,8 +1402,6 @@ dependencies = [ "common-settings", "once_cell", "pretty_assertions", - "strum", - "strum_macros", ] [[package]] diff --git a/src/query/formats/Cargo.toml b/src/query/formats/Cargo.toml index 5d4cda5d06b93..9656a1ad36ed8 100644 --- a/src/query/formats/Cargo.toml +++ b/src/query/formats/Cargo.toml @@ -22,8 +22,6 @@ common-settings = { path = "../settings" } # Crates.io dependencies once_cell = "1.15.0" -strum = "0.24.1" -strum_macros = "0.24.3" [dev-dependencies] common-arrow = { path = "../../common/arrow" } From 30c8095bb1a86acfb65dda71d16f074fd5f668c0 Mon Sep 17 00:00:00 2001 From: lichuang Date: Wed, 2 Nov 2022 19:54:18 +0800 Subject: [PATCH 08/10] fix check error --- src/query/config/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/config/Cargo.toml b/src/query/config/Cargo.toml index 961d4554a73e9..68ccb03814f91 100644 --- a/src/query/config/Cargo.toml +++ b/src/query/config/Cargo.toml @@ -14,7 +14,7 @@ storage-hdfs = ["common-storage/storage-hdfs"] hive = ["common-hive-meta-store", "thrift", "storage-hdfs"] [package.metadata.cargo-machete] -ignored = ["thrift", "common-hive-meta-store"] +ignored = ["thrift", "common-hive-meta-store", "strum"] [dependencies] common-base = { path = "../../common/base" } From 5a52cc21e065444228dd53f6313979d656e0cf76 Mon Sep 17 00:00:00 2001 From: lichuang Date: Thu, 3 Nov 2022 09:53:37 +0800 Subject: [PATCH 09/10] fix test fail --- src/query/service/tests/it/storages/testdata/system-tables.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/query/service/tests/it/storages/testdata/system-tables.txt b/src/query/service/tests/it/storages/testdata/system-tables.txt index 32ec3db9bebf2..1396748a0da4d 100644 --- a/src/query/service/tests/it/storages/testdata/system-tables.txt +++ b/src/query/service/tests/it/storages/testdata/system-tables.txt @@ -172,6 +172,7 @@ DB.Table: 'system'.'configs', Table: configs-table_id:1, ver:0, Engine: SystemCo | meta | password | | | | meta | rpc_tls_meta_server_root_ca_cert | | | | meta | rpc_tls_meta_service_domain_name | localhost | | +| meta | type | fallback | | | meta | username | root | | | query | admin_api_address | 127.0.0.1:8080 | | | query | api_tls_server_cert | | | From b248f049c7e932dd1dcb293521e42cbb5c32640a Mon Sep 17 00:00:00 2001 From: lichuang Date: Thu, 3 Nov 2022 14:32:21 +0800 Subject: [PATCH 10/10] fix test fail --- src/query/service/tests/it/configs.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/query/service/tests/it/configs.rs b/src/query/service/tests/it/configs.rs index f1c7d5015227e..548ba7ee192f9 100644 --- a/src/query/service/tests/it/configs.rs +++ b/src/query/service/tests/it/configs.rs @@ -93,6 +93,7 @@ level = "INFO" format = "text" [meta] +type = "fallback" embedded_dir = "./.databend/meta_embedded" address = "" endpoints = []