chore(core/raw): align info method of kv::Adapter and `typed_kv::…

…Adapter` (#5259)
apache · Nov 5, 2024 · f93c619 · f93c619
1 parent 259a19e
commit f93c619
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 64 deletions.
diff --git a/core/Cargo.lock b/core/Cargo.lock
diff --git a/core/src/raw/adapters/kv/api.rs b/core/src/raw/adapters/kv/api.rs
@@ -96,8 +96,8 @@ pub trait Adapter: Send + Sync + Debug + Unpin + 'static {
     /// TODO: use default associate type `= ()` after stablized
     type Scanner: Scan;
 
-    /// Return the metadata of this key value accessor.
-    fn metadata(&self) -> Metadata;
+    /// Return the info of this key value accessor.
+    fn info(&self) -> Info;
 
     /// Get a key from service.
     ///
@@ -196,14 +196,14 @@ pub trait Adapter: Send + Sync + Debug + Unpin + 'static {
     }
 }
 
-/// Metadata for this key value accessor.
-pub struct Metadata {
+/// Info for this key value accessor.
+pub struct Info {
     scheme: Scheme,
     name: String,
     capabilities: Capability,
 }
 
-impl Metadata {
+impl Info {
     /// Create a new KeyValueAccessorInfo.
     pub fn new(scheme: Scheme, name: &str, capabilities: Capability) -> Self {
         Self {
@@ -228,14 +228,3 @@ impl Metadata {
         self.capabilities
     }
 }
-
-impl From<Metadata> for AccessorInfo {
-    fn from(m: Metadata) -> AccessorInfo {
-        let mut am = AccessorInfo::default();
-        am.set_name(m.name());
-        am.set_scheme(m.scheme());
-        am.set_native_capability(m.capabilities());
-
-        am
-    }
-}
diff --git a/core/src/raw/adapters/kv/backend.rs b/core/src/raw/adapters/kv/backend.rs
@@ -72,10 +72,13 @@ impl<S: Adapter> Access for Backend<S> {
     type BlockingLister = HierarchyLister<BlockingKvLister>;
 
     fn info(&self) -> Arc<AccessorInfo> {
-        let mut am: AccessorInfo = self.kv.metadata().into();
+        let kv_info = self.kv.info();
+        let mut am: AccessorInfo = AccessorInfo::default();
         am.set_root(&self.root);
+        am.set_scheme(kv_info.scheme());
+        am.set_name(kv_info.name());
 
-        let mut cap = am.native_capability();
+        let mut cap = kv_info.capabilities();
         if cap.read {
             cap.stat = true;
         }

diff --git a/core/src/raw/adapters/kv/mod.rs b/core/src/raw/adapters/kv/mod.rs
@@ -21,7 +21,7 @@
 
 mod api;
 pub use api::Adapter;
-pub use api::Metadata;
+pub use api::Info;
 pub use api::Scan;
 #[cfg(any(
     feature = "services-cloudflare-kv",

diff --git a/core/src/raw/adapters/typed_kv/api.rs b/core/src/raw/adapters/typed_kv/api.rs
@@ -45,7 +45,7 @@ use crate::Scheme;
 /// Ideally, we should use `typed_kv::Adapter` instead of `kv::Adapter` for
 /// in-memory rust libs like moka and dashmap.
 pub trait Adapter: Send + Sync + Debug + Unpin + 'static {
-    /// Get the scheme and name of current adapter.
+    /// Return the info of this key value accessor.
     fn info(&self) -> Info;
 
     /// Get a value from adapter.

diff --git a/core/src/services/atomicserver/backend.rs b/core/src/services/atomicserver/backend.rs
@@ -353,8 +353,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Atomicserver,
             "atomicserver",
             Capability {

diff --git a/core/src/services/cacache/backend.rs b/core/src/services/cacache/backend.rs
@@ -87,8 +87,8 @@ impl Debug for Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Cacache,
             &self.datadir,
             Capability {

diff --git a/core/src/services/cloudflare_kv/backend.rs b/core/src/services/cloudflare_kv/backend.rs
@@ -183,8 +183,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = kv::Scanner;
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::CloudflareKv,
             &self.namespace_id,
             Capability {

diff --git a/core/src/services/d1/backend.rs b/core/src/services/d1/backend.rs
@@ -260,8 +260,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::D1,
             &self.table,
             Capability {

diff --git a/core/src/services/etcd/backend.rs b/core/src/services/etcd/backend.rs
@@ -274,8 +274,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = kv::ScanStdIter<vec::IntoIter<Result<String>>>;
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Etcd,
             &self.endpoints.join(","),
             Capability {

diff --git a/core/src/services/foundationdb/backend.rs b/core/src/services/foundationdb/backend.rs
@@ -112,8 +112,8 @@ impl Debug for Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Foundationdb,
             "foundationdb",
             Capability {

diff --git a/core/src/services/gridfs/backend.rs b/core/src/services/gridfs/backend.rs
@@ -214,8 +214,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Gridfs,
             &format!("{}/{}", self.database, self.bucket),
             Capability {

diff --git a/core/src/services/libsql/backend.rs b/core/src/services/libsql/backend.rs
@@ -307,8 +307,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Libsql,
             &self.table,
             Capability {

diff --git a/core/src/services/memcached/backend.rs b/core/src/services/memcached/backend.rs
@@ -199,8 +199,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Memcached,
             "memcached",
             Capability {

diff --git a/core/src/services/mongodb/backend.rs b/core/src/services/mongodb/backend.rs
@@ -228,8 +228,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Mongodb,
             &format!("{}/{}", self.database, self.collection),
             Capability {

diff --git a/core/src/services/mysql/backend.rs b/core/src/services/mysql/backend.rs
@@ -190,8 +190,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Mysql,
             &self.table,
             Capability {

diff --git a/core/src/services/nebula_graph/backend.rs b/core/src/services/nebula_graph/backend.rs
@@ -272,8 +272,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = kv::ScanStdIter<vec::IntoIter<Result<String>>>;
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::NebulaGraph,
             &self.session_config.space.clone().unwrap(),
             Capability {

diff --git a/core/src/services/persy/backend.rs b/core/src/services/persy/backend.rs
@@ -154,8 +154,8 @@ impl Debug for Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Persy,
             &self.datafile,
             Capability {

diff --git a/core/src/services/postgresql/backend.rs b/core/src/services/postgresql/backend.rs
@@ -189,8 +189,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Postgresql,
             &self.table,
             Capability {

diff --git a/core/src/services/redb/backend.rs b/core/src/services/redb/backend.rs
@@ -113,8 +113,8 @@ impl Debug for Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Redb,
             &self.datadir,
             Capability {

diff --git a/core/src/services/redis/backend.rs b/core/src/services/redis/backend.rs
@@ -329,8 +329,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Redis,
             self.addr.as_str(),
             Capability {

diff --git a/core/src/services/rocksdb/backend.rs b/core/src/services/rocksdb/backend.rs
@@ -110,8 +110,8 @@ impl Debug for Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = kv::Scanner;
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Rocksdb,
             &self.db.path().to_string_lossy(),
             Capability {

diff --git a/core/src/services/sled/backend.rs b/core/src/services/sled/backend.rs
@@ -139,8 +139,8 @@ impl Debug for Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = kv::Scanner;
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Sled,
             &self.datadir,
             Capability {

diff --git a/core/src/services/sqlite/backend.rs b/core/src/services/sqlite/backend.rs
@@ -224,8 +224,8 @@ impl kv::Scan for SqliteScanner {
 impl kv::Adapter for Adapter {
     type Scanner = SqliteScanner;
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Sqlite,
             &self.table,
             Capability {

diff --git a/core/src/services/surrealdb/backend.rs b/core/src/services/surrealdb/backend.rs
@@ -285,8 +285,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Surrealdb,
             &self.table,
             Capability {

diff --git a/core/src/services/tikv/backend.rs b/core/src/services/tikv/backend.rs
@@ -187,8 +187,8 @@ impl Adapter {
 impl kv::Adapter for Adapter {
     type Scanner = ();
 
-    fn metadata(&self) -> kv::Metadata {
-        kv::Metadata::new(
+    fn info(&self) -> kv::Info {
+        kv::Info::new(
             Scheme::Tikv,
             "TiKV",
             Capability {