From b76b4f71290e014dd3a234dd20f8023d23ccbb3d Mon Sep 17 00:00:00 2001 From: caicancai <2356672992@qq.com> Date: Thu, 9 Nov 2023 10:09:44 +0800 Subject: [PATCH 1/3] refactor(service/tikv): Add TikvConfig to implement ConfigDeserializer --- core/src/services/redis/backend.rs | 2 +- core/src/services/tikv/backend.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/services/redis/backend.rs b/core/src/services/redis/backend.rs index c083d9677d28..ff8e8d54e812 100644 --- a/core/src/services/redis/backend.rs +++ b/core/src/services/redis/backend.rs @@ -281,7 +281,7 @@ impl RedisBuilder { let port = ep_url.port_u16().unwrap_or(DEFAULT_REDIS_PORT); ConnectionAddr::Tcp(host, port) } - Some("rediss") => { + Some("redis") => { let host = ep_url .host() .map(|h| h.to_string()) diff --git a/core/src/services/tikv/backend.rs b/core/src/services/tikv/backend.rs index e60394acaa12..462d1b573685 100644 --- a/core/src/services/tikv/backend.rs +++ b/core/src/services/tikv/backend.rs @@ -122,7 +122,7 @@ impl TikvBuilder { impl Builder for TikvBuilder { const SCHEME: Scheme = Scheme::Tikv; - type Accessor = Backend; + type Accessor = TikvBackend; fn from_map(map: HashMap) -> Self { let config = TikvConfig::deserialize(ConfigDeserializer::new(map)) @@ -152,7 +152,7 @@ impl Builder for TikvBuilder { )?; } - Ok(Backend::new(Adapter { + Ok(TikvBackendBackend::new(Adapter { client: OnceCell::new(), endpoints, insecure: self.config.insecure, @@ -164,7 +164,7 @@ impl Builder for TikvBuilder { } /// Backend for TiKV service -pub type Backend = kv::Backend; +pub type TikvBackend = kv::TikvBackendBackend; #[derive(Clone)] pub struct Adapter { From cf3b9578b08e12e6b951340c767f0b6ad8717606 Mon Sep 17 00:00:00 2001 From: caicancai <2356672992@qq.com> Date: Thu, 9 Nov 2023 10:33:34 +0800 Subject: [PATCH 2/3] refactor(service/tikv): Add TikvConfig to implement ConfigDeserializer --- core/src/services/tikv/backend.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/services/tikv/backend.rs b/core/src/services/tikv/backend.rs index 462d1b573685..987fee60e16d 100644 --- a/core/src/services/tikv/backend.rs +++ b/core/src/services/tikv/backend.rs @@ -152,7 +152,7 @@ impl Builder for TikvBuilder { )?; } - Ok(TikvBackendBackend::new(Adapter { + Ok(TikvBackend::new(Adapter { client: OnceCell::new(), endpoints, insecure: self.config.insecure, @@ -164,7 +164,7 @@ impl Builder for TikvBuilder { } /// Backend for TiKV service -pub type TikvBackend = kv::TikvBackendBackend; +pub type TikvBackend = kv::Backend; #[derive(Clone)] pub struct Adapter { From c950c83970287061858c8bc39c22b35afde0491e Mon Sep 17 00:00:00 2001 From: caicancai <2356672992@qq.com> Date: Thu, 9 Nov 2023 12:06:58 +0800 Subject: [PATCH 3/3] refactor(service/tikv): Add TikvConfig to implement ConfigDeserializer --- core/src/services/redis/backend.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/services/redis/backend.rs b/core/src/services/redis/backend.rs index ff8e8d54e812..c083d9677d28 100644 --- a/core/src/services/redis/backend.rs +++ b/core/src/services/redis/backend.rs @@ -281,7 +281,7 @@ impl RedisBuilder { let port = ep_url.port_u16().unwrap_or(DEFAULT_REDIS_PORT); ConnectionAddr::Tcp(host, port) } - Some("redis") => { + Some("rediss") => { let host = ep_url .host() .map(|h| h.to_string())