feat(!): Allow users to build operator from config

Signed-off-by: Xuanwo <[email protected]>
apache · Jul 24, 2024 · 63065e8 · 63065e8
1 parent 5e735cc
commit 63065e8
Show file tree

Hide file tree

Showing 80 changed files with 854 additions and 1,110 deletions.
diff --git a/core/src/docs/internals/accessor.rs b/core/src/docs/internals/accessor.rs
@@ -256,10 +256,10 @@
 //!     type Config = DuckConfig;
 //!
 //!     fn from_config(config: Self::Config) -> Self {
-//!        DuckBuilder { config }
+//!        DuckBuilder { config: self }
 //!     }
 //!
-//!     fn build(&mut self) -> Result<Self::Accessor> {
+//!     fn build(self) -> Result<impl Access>  {
 //!         debug!("backend build started: {:?}", &self);
 //!
 //!         let root = normalize_root(&self.config.root.clone().unwrap_or_default());

diff --git a/core/src/layers/immutable_index.rs b/core/src/layers/immutable_index.rs
@@ -251,7 +251,7 @@ mod tests {
 
     use super::*;
     use crate::layers::LoggingLayer;
-    use crate::services::Http;
+    use crate::services::HttpConfig;
     use crate::EntryMode;
     use crate::Operator;
 
@@ -264,12 +264,12 @@ mod tests {
             iil.insert(i.to_string())
         }
 
-        let op = Http::from_map({
+        let op = HttpConfig::from_iter({
             let mut map = HashMap::new();
             map.insert("endpoint".to_string(), "https://xuanwo.io".to_string());
             map
         })
-        .and_then(Operator::new)?
+        .and_then(Operator::from_config)?
         .layer(LoggingLayer::default())
         .layer(iil)
         .finish();
@@ -302,12 +302,12 @@ mod tests {
             iil.insert(i.to_string())
         }
 
-        let op = Http::from_map({
+        let op = HttpConfig::from_iter({
             let mut map = HashMap::new();
             map.insert("endpoint".to_string(), "https://xuanwo.io".to_string());
             map
         })
-        .and_then(Operator::new)?
+        .and_then(Operator::from_config)?
         .layer(LoggingLayer::default())
         .layer(iil)
         .finish();
@@ -346,12 +346,12 @@ mod tests {
             iil.insert(i.to_string())
         }
 
-        let op = Http::from_map({
+        let op = HttpConfig::from_iter({
             let mut map = HashMap::new();
             map.insert("endpoint".to_string(), "https://xuanwo.io".to_string());
             map
         })
-        .and_then(Operator::new)?
+        .and_then(Operator::from_config)?
         .layer(LoggingLayer::default())
         .layer(iil)
         .finish();
@@ -404,12 +404,12 @@ mod tests {
             iil.insert(i.to_string())
         }
 
-        let op = Http::from_map({
+        let op = HttpConfig::from_iter({
             let mut map = HashMap::new();
             map.insert("endpoint".to_string(), "https://xuanwo.io".to_string());
             map
         })
-        .and_then(Operator::new)?
+        .and_then(Operator::from_config)?
         .layer(LoggingLayer::default())
         .layer(iil)
         .finish();

diff --git a/core/src/layers/retry.rs b/core/src/layers/retry.rs
@@ -773,15 +773,9 @@ mod tests {
 
     impl Builder for MockBuilder {
         const SCHEME: Scheme = Scheme::Custom("mock");
-        type Accessor = MockService;
-
         type Config = ();
 
-        fn from_config(_: Self::Config) -> Self {
-            Self::default()
-        }
-
-        fn build(&mut self) -> Result<Self::Accessor> {
+        fn build(self) -> Result<impl Access> {
             Ok(MockService {
                 attempt: self.attempt.clone(),
             })

diff --git a/core/src/services/aliyun_drive/backend.rs b/core/src/services/aliyun_drive/backend.rs
@@ -35,6 +35,7 @@ use super::lister::AliyunDriveLister;
 use super::lister::AliyunDriveParent;
 use super::writer::AliyunDriveWriter;
 use crate::raw::*;
+
 use crate::*;
 
 /// Aliyun Drive services support.
@@ -87,6 +88,15 @@ impl Debug for AliyunDriveConfig {
     }
 }
 
+impl Configurator for AliyunDriveConfig {
+    fn into_builder(self) -> impl Builder {
+        AliyunDriveBuilder {
+            config: self,
+            http_client: None,
+        }
+    }
+}
+
 #[doc = include_str!("docs.md")]
 #[derive(Default)]
 pub struct AliyunDriveBuilder {
@@ -167,25 +177,15 @@ impl AliyunDriveBuilder {
 
 impl Builder for AliyunDriveBuilder {
     const SCHEME: Scheme = Scheme::AliyunDrive;
-
-    type Accessor = AliyunDriveBackend;
-
     type Config = AliyunDriveConfig;
 
-    fn from_config(config: Self::Config) -> Self {
-        AliyunDriveBuilder {
-            config,
-            http_client: None,
-        }
-    }
-
-    fn build(&mut self) -> Result<Self::Accessor> {
+    fn build(self) -> Result<impl Access> {
         debug!("backend build started: {:?}", &self);
 
         let root = normalize_root(&self.config.root.clone().unwrap_or_default());
         debug!("backend use root {}", &root);
 
-        let client = if let Some(client) = self.http_client.take() {
+        let client = if let Some(client) = self.http_client {
             client
         } else {
             HttpClient::new().map_err(|err| {
@@ -449,7 +449,6 @@ impl Access for AliyunDriveBackend {
                     serde_json::from_reader(res.reader()).map_err(new_json_serialize_error)?;
                 Some(AliyunDriveParent {
                     file_id: file.file_id,
-                    name: file.name,
                     path: path.to_string(),
                     updated_at: file.updated_at,
                 })

diff --git a/core/src/services/aliyun_drive/core.rs b/core/src/services/aliyun_drive/core.rs
@@ -382,19 +382,6 @@ impl AliyunDriveCore {
         self.send(req, token.as_deref()).await
     }
 
-    pub async fn get(&self, file_id: &str) -> Result<Buffer> {
-        let (token, drive_id) = self.get_token_and_drive().await?;
-        let body = serde_json::to_vec(&FileRequest {
-            drive_id: &drive_id,
-            file_id,
-        })
-        .map_err(new_json_serialize_error)?;
-        let req = Request::post(format!("{}/adrive/v1.0/openFile/get", self.endpoint))
-            .body(Buffer::from(body))
-            .map_err(new_request_build_error)?;
-        self.send(req, token.as_deref()).await
-    }
-
     pub async fn upload(&self, upload_url: &str, body: Buffer) -> Result<Buffer> {
         let req = Request::put(upload_url)
             .body(body)

diff --git a/core/src/services/aliyun_drive/lister.rs b/core/src/services/aliyun_drive/lister.rs
@@ -39,7 +39,6 @@ pub struct AliyunDriveLister {
 
 pub struct AliyunDriveParent {
     pub file_id: String,
-    pub name: String,
     pub path: String,
     pub updated_at: String,
 }

diff --git a/core/src/services/alluxio/backend.rs b/core/src/services/alluxio/backend.rs
@@ -59,6 +59,15 @@ impl Debug for AlluxioConfig {
     }
 }
 
+impl Configurator for AlluxioConfig {
+    fn into_builder(self) -> impl Builder {
+        AlluxioBuilder {
+            config: self,
+            http_client: None,
+        }
+    }
+}
+
 /// [Alluxio](https://www.alluxio.io/) services support.
 #[doc = include_str!("docs.md")]
 #[derive(Default)]
@@ -117,18 +126,10 @@ impl AlluxioBuilder {
 
 impl Builder for AlluxioBuilder {
     const SCHEME: Scheme = Scheme::Alluxio;
-    type Accessor = AlluxioBackend;
     type Config = AlluxioConfig;
 
-    fn from_config(config: Self::Config) -> Self {
-        AlluxioBuilder {
-            config,
-            http_client: None,
-        }
-    }
-
     /// Builds the backend and returns the result of AlluxioBackend.
-    fn build(&mut self) -> Result<Self::Accessor> {
+    fn build(self) -> Result<impl Access> {
         debug!("backend build started: {:?}", &self);
 
         let root = normalize_root(&self.config.root.clone().unwrap_or_default());
@@ -142,7 +143,7 @@ impl Builder for AlluxioBuilder {
         }?;
         debug!("backend use endpoint {}", &endpoint);
 
-        let client = if let Some(client) = self.http_client.take() {
+        let client = if let Some(client) = self.http_client {
             client
         } else {
             HttpClient::new().map_err(|err| {
@@ -259,13 +260,10 @@ mod test {
         map.insert("root".to_string(), "/".to_string());
         map.insert("endpoint".to_string(), "http://127.0.0.1:39999".to_string());
 
-        let builder = AlluxioBuilder::from_map(map).unwrap();
+        let builder = AlluxioConfig::from_iter(map).unwrap();
 
-        assert_eq!(builder.config.root, Some("/".to_string()));
-        assert_eq!(
-            builder.config.endpoint,
-            Some("http://127.0.0.1:39999".to_string())
-        );
+        assert_eq!(builder.root, Some("/".to_string()));
+        assert_eq!(builder.endpoint, Some("http://127.0.0.1:39999".to_string()));
     }
 
     #[test]

diff --git a/core/src/services/atomicserver/backend.rs b/core/src/services/atomicserver/backend.rs
@@ -62,6 +62,12 @@ impl Debug for AtomicserverConfig {
     }
 }
 
+impl Configurator for AtomicserverConfig {
+    fn into_builder(self) -> impl Builder {
+        AtomicserverBuilder { config: self }
+    }
+}
+
 #[doc = include_str!("docs.md")]
 #[derive(Default)]
 pub struct AtomicserverBuilder {
@@ -113,14 +119,9 @@ impl AtomicserverBuilder {
 
 impl Builder for AtomicserverBuilder {
     const SCHEME: Scheme = Scheme::Atomicserver;
-    type Accessor = AtomicserverBackend;
     type Config = AtomicserverConfig;
 
-    fn from_config(config: Self::Config) -> Self {
-        Self { config }
-    }
-
-    fn build(&mut self) -> Result<Self::Accessor> {
+    fn build(self) -> Result<impl Access> {
         let root = normalize_root(
             self.config
                 .root