[#676] feat(jdbc): Support jdbc operations in JDBC catalog.

apache · Nov 17, 2023 · 8977c1a · 8977c1a
1 parent 8b0f23f
commit 8977c1a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 34 deletions.
diff --git a/...dbc-common/src/main/java/com/datastrato/gravitino/catalog/jdbc/JdbcCatalogOperations.java b/...dbc-common/src/main/java/com/datastrato/gravitino/catalog/jdbc/JdbcCatalogOperations.java
@@ -96,16 +96,10 @@ public void initialize(Map<String, String> conf) throws RuntimeException {
     // Key format like gravitino.bypass.a.b
     Map<String, String> resultConf =
         Maps.newHashMap(MapUtils.getPrefixMap(conf, CATALOG_BYPASS_PREFIX));
-    this.jdbcCatalogPropertiesMetadata = new JdbcCatalogPropertiesMetadata();
-    // Hold keys that lie in GRAVITINO_CONFIG_TO_JDBC
-    Map<String, String> gravitinoConfig =
-        this.jdbcCatalogPropertiesMetadata.transformProperties(conf);
-
-    resultConf.putAll(gravitinoConfig);
-
     JdbcConfig jdbcConfig = new JdbcConfig(resultConf);
-    dataSource = DataSourceUtils.createDataSource(jdbcConfig);
+    this.dataSource = DataSourceUtils.createDataSource(jdbcConfig);
     this.jdbcDatabaseOperations.initialize(dataSource, exceptionConverter);
+    this.jdbcCatalogPropertiesMetadata = new JdbcCatalogPropertiesMetadata();
     this.jdbcTablePropertiesMetadata = new JdbcTablePropertiesMetadata();
     this.jdbcSchemaPropertiesMetadata = new JdbcSchemaPropertiesMetadata();
   }

diff --git a/...on/src/main/java/com/datastrato/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java b/...on/src/main/java/com/datastrato/gravitino/catalog/jdbc/JdbcCatalogPropertiesMetadata.java
@@ -11,23 +11,13 @@
 import com.datastrato.gravitino.catalog.PropertyEntry;
 import com.datastrato.gravitino.catalog.jdbc.config.JdbcConfig;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import java.util.List;
 import java.util.Map;
 
 public class JdbcCatalogPropertiesMetadata extends BaseCatalogPropertiesMetadata {
   private static final Map<String, PropertyEntry<?>> PROPERTIES_METADATA;
 
-  public static final Map<String, String> GRAVITINO_CONFIG_TO_JDBC =
-      ImmutableMap.<String, String>builder()
-          .put(JdbcConfig.JDBC_URL.getKey(), JdbcConfig.JDBC_URL.getKey())
-          .put(JdbcConfig.USERNAME.getKey(), JdbcConfig.USERNAME.getKey())
-          .put(JdbcConfig.PASSWORD.getKey(), JdbcConfig.PASSWORD.getKey())
-          .put(JdbcConfig.POOL_MIN_IDLE.getKey(), JdbcConfig.POOL_MIN_IDLE.getKey())
-          .put(JdbcConfig.POOL_MAX_SIZE.getKey(), JdbcConfig.POOL_MAX_SIZE.getKey())
-          .build();;
-
   static {
     List<PropertyEntry<?>> propertyEntries =
         ImmutableList.of(
@@ -60,15 +50,4 @@ public class JdbcCatalogPropertiesMetadata extends BaseCatalogPropertiesMetadata
   protected Map<String, PropertyEntry<?>> specificPropertyEntries() {
     return PROPERTIES_METADATA;
   }
-
-  public Map<String, String> transformProperties(Map<String, String> conf) {
-    Map<String, String> gravitinoConfig = Maps.newHashMap();
-    conf.forEach(
-        (key, value) -> {
-          if (GRAVITINO_CONFIG_TO_JDBC.containsKey(key)) {
-            gravitinoConfig.put(GRAVITINO_CONFIG_TO_JDBC.get(key), value);
-          }
-        });
-    return gravitinoConfig;
-  }
 }
diff --git a/...og-jdbc-common/src/main/java/com/datastrato/gravitino/catalog/jdbc/config/JdbcConfig.java b/...og-jdbc-common/src/main/java/com/datastrato/gravitino/catalog/jdbc/config/JdbcConfig.java
@@ -72,8 +72,4 @@ public JdbcConfig(Map<String, String> properties) {
     loadFromMap(properties, k -> true);
     assert null != getJdbcUrl();
   }
-
-  public Map<String, String> getAllProperties() {
-    return getConfigsWithPrefix("");
-  }
 }
diff --git a/...dbc-common/src/main/java/com/datastrato/gravitino/catalog/jdbc/utils/DataSourceUtils.java b/...dbc-common/src/main/java/com/datastrato/gravitino/catalog/jdbc/utils/DataSourceUtils.java
@@ -57,7 +57,7 @@ private static DataSource createDBCPDataSource(JdbcConfig jdbcConfig) throws Exc
 
   private static Properties getProperties(JdbcConfig jdbcConfig) {
     Properties properties = new Properties();
-    properties.putAll(jdbcConfig.getAllProperties());
+    properties.putAll(jdbcConfig.getAllConfig());
     return properties;
   }
 

diff --git a/common/src/main/java/com/datastrato/gravitino/Config.java b/common/src/main/java/com/datastrato/gravitino/Config.java
@@ -132,6 +132,10 @@ public Map<String, String> getConfigsWithPrefix(String prefix) {
     return MapUtils.getPrefixMap(configMap, prefix);
   }
 
+  public Map<String, String> getAllConfig() {
+    return MapUtils.unmodifiableMap(configMap);
+  }
+
   /**
    * Sets the value of a configuration entry.
    *

diff --git a/common/src/main/java/com/datastrato/gravitino/utils/MapUtils.java b/common/src/main/java/com/datastrato/gravitino/utils/MapUtils.java
@@ -22,4 +22,8 @@ public static Map<String, String> getPrefixMap(Map<String, String> m, String pre
 
     return Collections.unmodifiableMap(configs);
   }
+
+  public static Map<String, String> unmodifiableMap(Map<String, String> m) {
+    return Collections.unmodifiableMap(m);
+  }
 }