Update deom

Author: liurenjie1024

crates/catalog/loader/src/lib.rs

@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
@@ -8,34 +9,13 @@ use iceberg_catalog_rest::RestCatalogBuilder;
 type BoxedCatalogBuilderFuture = Pin<Box<dyn Future<Output = Result<Arc<dyn Catalog>>>>>;
 
 pub trait BoxedCatalogBuilder {
-    fn name(&mut self, name: String);
-    fn uri(&mut self, uri: String);
-    fn warehouse(&mut self, warehouse: String);
-    fn with_prop(&mut self, key: String, value: String);
-
-    fn build(self: Box<Self>) -> BoxedCatalogBuilderFuture;
+    fn load(self: Box<Self>, name: String, props: HashMap<String, String>) -> BoxedCatalogBuilderFuture;
 }
 
 impl<T: CatalogBuilder + 'static> BoxedCatalogBuilder for T {
-    fn name(&mut self, name: String) {
-        self.name(name);
-    }
-
-    fn uri(&mut self, uri: String) {
-        self.uri(uri);
-    }
-
-    fn warehouse(&mut self, warehouse: String) {
-        self.warehouse(warehouse);
-    }
-
-    fn with_prop(&mut self, key: String, value: String) {
-        self.with_prop(key, value);
-    }
-
-    fn build(self: Box<Self>) -> BoxedCatalogBuilderFuture {
+    fn load(self: Box<Self>, name: String, props: HashMap<String, String>) -> BoxedCatalogBuilderFuture {
         let builder = *self;
-        Box::pin(async move { Ok(Arc::new(builder.build().await.unwrap()) as Arc<dyn Catalog>) })
+        Box::pin(async move { Ok(Arc::new(builder.load(name, props).await.unwrap()) as Arc<dyn Catalog>) })
     }
 }
 
@@ -51,14 +31,14 @@ pub fn load(r#type: &str) -> Result<Box<dyn BoxedCatalogBuilder>> {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
     use crate::load;
 
     #[tokio::test]
     async fn test_load() {
         let mut catalog = load("rest").unwrap();
-        catalog.name("rest".to_string());
-        catalog.with_prop("key".to_string(), "value".to_string());
-
-        catalog.build().await.unwrap();
+        catalog.load("rest".to_string(), HashMap::from(
+            [("key".to_string(), "value".to_string())]
+        )).await.unwrap();
     }
 }

crates/catalog/rest/src/catalog.rs

@@ -45,6 +45,8 @@ use crate::types::{
     RenameTableRequest,
 };
 
+const REST_CATALOG_PROP_URI: &str = "uri";
+const REST_CATALOG_PROP_WAREHOUSE: &str = "warehouse";
 const ICEBERG_REST_SPEC_VERSION: &str = "0.14.1";
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
 const PATH_V1: &str = "v1";
@@ -245,27 +247,22 @@ impl Default for RestCatalogBuilder {
 impl CatalogBuilder for RestCatalogBuilder {
     type C = RestCatalog;
 
-    fn name(&mut self, name: impl Into<String>) -> &mut Self {
+    fn load(mut self, name: impl Into<String>, props: HashMap<String, String>) -> impl Future<Output=Result<Self::C>> {
         self.0.name = Some(name.into());
-        self
-    }
-
-    fn uri(&mut self, uri: impl Into<String>) -> &mut Self {
-        self.0.uri = uri.into();
-        self
-    }
-
-    fn warehouse(&mut self, warehouse: impl Into<String>) -> &mut Self {
-        self.0.warehouse = Some(warehouse.into());
-        self
-    }
-
-    fn with_prop(&mut self, key: impl Into<String>, value: impl Into<String>) -> &mut Self {
-        self.0.props.insert(key.into(), value.into());
-        self
-    }
+        if props.contains_key(REST_CATALOG_PROP_URI) {
+            self.0.uri = props
+                .get(REST_CATALOG_PROP_URI)
+                .cloned()
+                .unwrap_or_default();
+        }
+        
+        if props.contains_key(REST_CATALOG_PROP_WAREHOUSE) {
+            self.0.warehouse = props
+                .get(REST_CATALOG_PROP_WAREHOUSE)
+                .cloned()
+                .map(|s| s.into());
+        }
 
-    fn build(self) -> impl Future<Output = Result<Self::C>> {
         let result = {
             if self.0.name.is_none() {
                 Err(Error::new(
@@ -283,6 +280,7 @@ impl CatalogBuilder for RestCatalogBuilder {
         };
 
         std::future::ready(result)
+        
     }
 }
 
@@ -2332,12 +2330,12 @@ mod tests {
     #[tokio::test]
     async fn test_create_rest_catalog() {
         let mut builder = RestCatalogBuilder::default();
-        builder
-            .name("test")
-            .uri("http://localhost:8080")
-            .with_client(Client::new())
-            .with_prop("a", "b");
-        let catalog = builder.build().await;
+        builder.with_client(Client::new());
+        
+        let catalog = builder.load("test", HashMap::from([
+            ("uri".to_string(), "http://localhost:8080".to_string()),
+            ("a".to_string(), "b".to_string()),
+        ])).await;
 
         assert!(catalog.is_ok());
     }

crates/iceberg/src/catalog/mod.rs

@@ -101,16 +101,8 @@ pub trait Catalog: Debug + Sync + Send {
 pub trait CatalogBuilder: Default + Debug + Send + Sync {
     /// The catalog type that this builder creates.
     type C: Catalog;
-    /// Configure the name of the catalog.
-    fn name(&mut self, name: impl Into<String>) -> &mut Self;
-    /// Configure uri of the catalog.
-    fn uri(&mut self, uri: impl Into<String>) -> &mut Self;
-    /// Configure the warehouse location of the catalog.
-    fn warehouse(&mut self, warehouse: impl Into<String>) -> &mut Self;
-    /// Configure properties of the catalog.
-    fn with_prop(&mut self, key: impl Into<String>, value: impl Into<String>) -> &mut Self;
-    /// Create the catalog
-    fn build(self) -> impl Future<Output = Result<Self::C>>;
+    /// Create a new catalog instance.
+    fn load(self, name: impl Into<String>, props: HashMap<String, String>) -> impl Future<Output = Result<Self::C>>;
 }
 
 /// NamespaceIdent represents the identifier of a namespace in the catalog.