[#655] feat(jdbc): Initialize the JDBC module in Gravitino.

apache · Nov 6, 2023 · eaa6225 · eaa6225
1 parent 2abe779
commit eaa6225
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 35 deletions.
diff --git a/catalogs/catalog-jdbc/build.gradle.kts → ...logs/catalog-jdbc-common/build.gradle.kts b/catalogs/catalog-jdbc/build.gradle.kts → ...logs/catalog-jdbc-common/build.gradle.kts
@@ -2,7 +2,7 @@
  * Copyright 2023 Datastrato.
  * This software is licensed under the Apache License version 2.
  */
-description = "catalog-jdbc"
+description = "catalog-jdbc-common"
 
 plugins {
     `maven-publish`
@@ -15,7 +15,6 @@ dependencies {
     implementation(project(":common"))
     implementation(project(":core"))
     implementation(project(":api"))
-    implementation(project(":server-common"))
     implementation(libs.jackson.databind)
     implementation(libs.jackson.annotations)
     implementation(libs.jackson.datatype.jdk8)
@@ -35,21 +34,9 @@ dependencies {
         exclude("com.google.code.findbugs")
         exclude("org.slf4j")
     }
-    implementation(libs.sqlite.jdbc)
 
     compileOnly(libs.lombok)
     annotationProcessor(libs.lombok)
-
-    testImplementation(libs.junit.jupiter.api)
-    testImplementation(libs.junit.jupiter.params)
-    testRuntimeOnly(libs.junit.jupiter.engine)
-    testImplementation(libs.mockito.core)
-    testImplementation(libs.jersey.test.framework.core) {
-        exclude(group = "org.junit.jupiter")
-    }
-    testImplementation(libs.jersey.test.framework.provider.jetty) {
-        exclude(group = "org.junit.jupiter")
-    }
 }
 
 tasks {
@@ -60,12 +47,12 @@ tasks {
     val copyCatalogLibs by registering(Copy::class) {
         dependsOn(copyDepends, "build")
         from("build/libs")
-        into("${rootDir}/distribution/package/catalogs/jdbc/libs")
+        into("${rootDir}/distribution/package/catalogs/jdbc-common/libs")
     }
 
     val copyCatalogConfig by registering(Copy::class) {
         from("src/main/resources")
-        into("${rootDir}/distribution/package/catalogs/jdbc/conf")
+        into("${rootDir}/distribution/package/catalogs/jdbc-common/conf")
 
         include("jdbc.properties")
         rename { original -> if (original.endsWith(".template")) {

diff --git a/...o/gravitino/catalog/jdbc/JdbcCatalog.java → ...o/gravitino/catalog/jdbc/JdbcCatalog.java b/...o/gravitino/catalog/jdbc/JdbcCatalog.java → ...o/gravitino/catalog/jdbc/JdbcCatalog.java
@@ -11,13 +11,7 @@
 import java.util.Map;
 
 /** Implementation of an Jdbc catalog in Gravitino. */
-public class JdbcCatalog extends BaseCatalog<JdbcCatalog> {
-
-  /** @return The short name of the catalog. */
-  @Override
-  public String shortName() {
-    return "jdbc";
-  }
+public abstract class JdbcCatalog extends BaseCatalog<JdbcCatalog> {
 
   /**
    * Creates a new instance of {@link JdbcCatalogOperations} with the provided configuration.

diff --git a/...o/catalog/jdbc/JdbcCatalogOperations.java → ...o/catalog/jdbc/JdbcCatalogOperations.java b/...o/catalog/jdbc/JdbcCatalogOperations.java → ...o/catalog/jdbc/JdbcCatalogOperations.java
diff --git a/...g/jdbc/JdbcCatalogPropertiesMetadata.java → ...g/jdbc/JdbcCatalogPropertiesMetadata.java b/...g/jdbc/JdbcCatalogPropertiesMetadata.java → ...g/jdbc/JdbcCatalogPropertiesMetadata.java
diff --git a/...to/gravitino/catalog/jdbc/JdbcColumn.java → ...to/gravitino/catalog/jdbc/JdbcColumn.java b/...to/gravitino/catalog/jdbc/JdbcColumn.java → ...to/gravitino/catalog/jdbc/JdbcColumn.java
diff --git a/...to/gravitino/catalog/jdbc/JdbcSchema.java → ...to/gravitino/catalog/jdbc/JdbcSchema.java b/...to/gravitino/catalog/jdbc/JdbcSchema.java → ...to/gravitino/catalog/jdbc/JdbcSchema.java
@@ -19,10 +19,7 @@ public static class Builder extends BaseSchemaBuilder<Builder, JdbcSchema> {
     protected JdbcSchema internalBuild() {
       JdbcSchema jdbcSchema = new JdbcSchema();
       jdbcSchema.name = name;
-      jdbcSchema.comment =
-          null == comment
-              ? (null == properties ? null : properties.get(JdbcSchemaPropertiesMetadata.COMMENT))
-              : comment;
+      jdbcSchema.comment = comment;
       jdbcSchema.properties = properties;
       jdbcSchema.auditInfo = auditInfo;
       return jdbcSchema;

diff --git a/...og/jdbc/JdbcSchemaPropertiesMetadata.java → ...og/jdbc/JdbcSchemaPropertiesMetadata.java b/...og/jdbc/JdbcSchemaPropertiesMetadata.java → ...og/jdbc/JdbcSchemaPropertiesMetadata.java
@@ -10,6 +10,7 @@
 import com.datastrato.gravitino.catalog.PropertyEntry;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -26,6 +27,6 @@ public class JdbcSchemaPropertiesMetadata extends BasePropertiesMetadata {
 
   @Override
   protected Map<String, PropertyEntry<?>> specificPropertyEntries() {
-    return PROPERTIES_METADATA;
+    return Collections.unmodifiableMap(PROPERTIES_METADATA);
   }
 }
diff --git a/...ato/gravitino/catalog/jdbc/JdbcTable.java → ...ato/gravitino/catalog/jdbc/JdbcTable.java b/...ato/gravitino/catalog/jdbc/JdbcTable.java → ...ato/gravitino/catalog/jdbc/JdbcTable.java
@@ -36,9 +36,6 @@ protected JdbcTable internalBuild() {
       jdbcTable.columns = columns;
       jdbcTable.partitions = partitions;
       jdbcTable.sortOrders = sortOrders;
-      if (null != comment) {
-        jdbcTable.properties.putIfAbsent(JDBC_COMMENT_FIELD_NAME, comment);
-      }
       return jdbcTable;
     }
   }

diff --git a/...log/jdbc/JdbcTablePropertiesMetadata.java → ...log/jdbc/JdbcTablePropertiesMetadata.java b/...log/jdbc/JdbcTablePropertiesMetadata.java → ...log/jdbc/JdbcTablePropertiesMetadata.java
@@ -6,13 +6,13 @@
 
 import com.datastrato.gravitino.catalog.BasePropertiesMetadata;
 import com.datastrato.gravitino.catalog.PropertyEntry;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.Map;
 
 public class JdbcTablePropertiesMetadata extends BasePropertiesMetadata {
 
   @Override
   protected Map<String, PropertyEntry<?>> specificPropertyEntries() {
-    return new HashMap<>();
+    return Collections.emptyMap();
   }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,6 +5,6 @@
 rootProject.name = "gravitino"
 
 include("api", "common", "core", "meta", "server", "integration-test", "server-common")
-include("catalogs:catalog-hive", "catalogs:catalog-lakehouse-iceberg", "catalogs:catalog-jdbc")
+include("catalogs:catalog-hive", "catalogs:catalog-lakehouse-iceberg", "catalogs:catalog-jdbc-common")
 include("clients:client-java", "clients:client-java-runtime")
-include("trino-connector")
+include("trino-connector")