diff --git a/core/src/services/mod.rs b/core/src/services/mod.rs index b6ff23f3ef38..154e7f0291e1 100644 --- a/core/src/services/mod.rs +++ b/core/src/services/mod.rs @@ -197,4 +197,4 @@ pub use self::redb::Redb; #[cfg(feature = "services-tikv")] mod tikv; #[cfg(feature = "services-tikv")] -pub use self::tikv::TiKV; +pub use self::tikv::Tikv; diff --git a/core/src/services/tikv/backend.rs b/core/src/services/tikv/backend.rs index 67091d4154b5..fcee836cd02a 100644 --- a/core/src/services/tikv/backend.rs +++ b/core/src/services/tikv/backend.rs @@ -34,7 +34,7 @@ use std::fmt::Formatter; /// TiKV backend builder #[derive(Clone, Default)] -pub struct TiKVBuilder { +pub struct TikvBuilder { /// network address of the TiKV service. /// /// default is "127.0.0.1:2379" @@ -49,10 +49,10 @@ pub struct TiKVBuilder { key_path: Option, } -impl TiKVBuilder { +impl TikvBuilder { /// Set the network address of the TiKV service. - pub fn endpoints(&mut self, endpoints: impl Into>) -> &mut Self { - let ep: Vec = endpoints.into().into_iter().collect(); + pub fn endpoints(&mut self, endpoints: Vec) -> &mut Self { + let ep: Vec = endpoints.into_iter().collect(); if !ep.is_empty() { self.endpoints = Some(ep) } @@ -90,12 +90,12 @@ impl TiKVBuilder { } } -impl Builder for TiKVBuilder { +impl Builder for TikvBuilder { const SCHEME: Scheme = Scheme::Redb; type Accessor = Backend; fn from_map(map: HashMap) -> Self { - let mut builder = TiKVBuilder::default(); + let mut builder = TikvBuilder::default(); map.get("endpoints") .map(|v| v.split(',').map(|s| s.to_owned()).collect::>()) @@ -116,21 +116,21 @@ impl Builder for TiKVBuilder { ErrorKind::ConfigInvalid, "endpoints is required but not set", ) - .with_context("service", Scheme::TiKV) + .with_context("service", Scheme::Tikv) })?; if self.insecure { if self.ca_path.is_some() || self.key_path.is_some() || self.cert_path.is_some() { return Err( Error::new(ErrorKind::ConfigInvalid, "invalid tls configuration") - .with_context("service", Scheme::TiKV) + .with_context("service", Scheme::Tikv) .with_context("endpoints", format!("{:?}", endpoints)), )?; } } else if !(self.ca_path.is_some() && self.key_path.is_some() && self.cert_path.is_some()) { return Err( Error::new(ErrorKind::ConfigInvalid, "invalid tls configuration") - .with_context("service", Scheme::TiKV) + .with_context("service", Scheme::Tikv) .with_context("endpoints", format!("{:?}", endpoints)), )?; } @@ -163,10 +163,6 @@ impl Debug for Adapter { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { let mut ds = f.debug_struct("Adapter"); ds.field("endpoints", &self.endpoints); - ds.field("insecure", &self.insecure); - ds.field("ca_path", &self.ca_path); - ds.field("cert_path", &self.cert_path); - ds.field("key_path", &self.key_path); ds.finish() } } @@ -182,7 +178,7 @@ impl Adapter { .await .map_err(|err| { Error::new(ErrorKind::ConfigInvalid, "invalid configuration") - .with_context("service", Scheme::TiKV) + .with_context("service", Scheme::Tikv) .with_context("endpoints", format!("{:?}", self.endpoints)) .set_source(err) })? @@ -197,14 +193,14 @@ impl Adapter { .await .map_err(|err| { Error::new(ErrorKind::ConfigInvalid, "invalid configuration") - .with_context("service", Scheme::TiKV) + .with_context("service", Scheme::Tikv) .with_context("endpoints", format!("{:?}", self.endpoints)) .set_source(err) })? } else { return Err( Error::new(ErrorKind::ConfigInvalid, "invalid configuration") - .with_context("service", Scheme::TiKV) + .with_context("service", Scheme::Tikv) .with_context("endpoints", format!("{:?}", self.endpoints)), ); }; @@ -216,7 +212,7 @@ impl Adapter { impl kv::Adapter for Adapter { fn metadata(&self) -> kv::Metadata { kv::Metadata::new( - Scheme::TiKV, + Scheme::Tikv, "TiKV", Capability { read: true, diff --git a/core/src/services/tikv/mod.rs b/core/src/services/tikv/mod.rs index 75a3eb5d3209..a79f3d61d432 100644 --- a/core/src/services/tikv/mod.rs +++ b/core/src/services/tikv/mod.rs @@ -18,4 +18,4 @@ mod backend; -pub use backend::TiKVBuilder as TiKV; +pub use backend::TikvBuilder as Tikv; diff --git a/core/src/types/scheme.rs b/core/src/types/scheme.rs index 838bf4d6c79a..02dc46c62fd7 100644 --- a/core/src/types/scheme.rs +++ b/core/src/types/scheme.rs @@ -102,8 +102,8 @@ pub enum Scheme { Webhdfs, /// [redb][crate::services::Redb]: Redb Services Redb, - /// [tikv][crate::services::tikv]: TiKV Services - TiKV, + /// [tikv][crate::services::tikv]: Tikv Services + Tikv, /// Custom that allow users to implement services outside of OpenDAL. /// /// # NOTE @@ -211,7 +211,7 @@ impl From for &'static str { Scheme::Webdav => "webdav", Scheme::Webhdfs => "webhdfs", Scheme::Redb => "redb", - Scheme::TiKV => "tikv", + Scheme::Tikv => "tikv", Scheme::Custom(v) => v, } }