[JDBC] Part3: Plumb JDBC module to quarkus

Author: singhpk234

Diff for: extension/persistence/relational-jdbc/build.gradle.kts

@@ -17,7 +17,10 @@
  * under the License.
  */
 
-plugins { id("polaris-server") }
+plugins {
+  id("polaris-server")
+  alias(libs.plugins.jandex)
+}
 
 dependencies {
   implementation(project(":polaris-core"))
@@ -28,8 +31,6 @@ dependencies {
   compileOnly(libs.jakarta.inject.api)
 
   implementation(libs.smallrye.common.annotation) // @Identifier
-
-  runtimeOnly(libs.postgresql)
   testImplementation(libs.mockito.junit.jupiter)
 
   testImplementation(libs.h2)

Diff for: extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/DatasourceOperations.java

@@ -28,6 +28,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import javax.sql.DataSource;
 import org.slf4j.Logger;
@@ -40,15 +41,21 @@ public class DatasourceOperations {
   private static final String CONSTRAINT_VIOLATION_SQL_CODE = "23505";
 
   private final DataSource datasource;
+  private final String realm;
 
-  public DatasourceOperations(DataSource datasource) {
+  public DatasourceOperations(DataSource datasource, String realm) {
     this.datasource = datasource;
+    this.realm = realm.toUpperCase(Locale.ROOT);
   }
 
   public void executeScript(String scriptFilePath) throws SQLException {
     ClassLoader classLoader = DatasourceOperations.class.getClassLoader();
-    try (Connection connection = borrowConnection();
+    Statement realmSchemaStatement = null;
+    try (Connection connection = datasource.getConnection();
         Statement statement = connection.createStatement()) {
+      statement.execute(String.format("CREATE SCHEMA IF NOT EXISTS %s", realm));
+      statement.close();
+      realmSchemaStatement = borrowConnection().createStatement();
       BufferedReader reader =
           new BufferedReader(
               new InputStreamReader(
@@ -62,7 +69,7 @@ public void executeScript(String scriptFilePath) throws SQLException {
           if (line.endsWith(";")) { // Execute statement when semicolon is found
             String sql = sqlBuffer.toString().trim();
             try {
-              int rowsUpdated = statement.executeUpdate(sql);
+              int rowsUpdated = realmSchemaStatement.executeUpdate(sql);
               LOGGER.debug("Query {} executed {} rows affected", sql, rowsUpdated);
             } catch (SQLException e) {
               LOGGER.error("Error executing query {}", sql, e);
@@ -79,6 +86,10 @@ public void executeScript(String scriptFilePath) throws SQLException {
     } catch (SQLException e) {
       LOGGER.error("Error executing the script file", e);
       throw e;
+    } finally {
+      if (realmSchemaStatement != null) {
+        realmSchemaStatement.close();
+      }
     }
   }
 
@@ -151,7 +162,6 @@ public void runWithinTransaction(TransactionCallback callback) throws SQLExcepti
           connection.close();
         } catch (SQLException e) {
           LOGGER.error("Error closing connection", e);
-          throw e;
         }
       }
     }
@@ -171,6 +181,20 @@ public boolean isAlreadyExistsException(SQLException e) {
   }
 
   private Connection borrowConnection() throws SQLException {
-    return datasource.getConnection();
+    Connection connection = datasource.getConnection();
+    if (connection
+        .getMetaData()
+        .getDatabaseProductName()
+        .toLowerCase(Locale.ROOT)
+        .equals("postgresql")) {
+      // connection.setSchema() doesn't work hence work this around.
+      Statement s = connection.createStatement();
+      s.execute("SET search_path TO " + realm);
+      s.close();
+    } else {
+      connection.setSchema(realm);
+    }
+
+    return connection;
   }
 }

Diff for: extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcCrudQueryGenerator.java

@@ -285,9 +285,6 @@ private static String getTableName(Class<?> entityClass) {
       throw new IllegalArgumentException("Unsupported entity class: " + entityClass.getName());
     }
 
-    // TODO: check if we want to make schema name configurable.
-    tableName = "POLARIS_SCHEMA." + tableName;
-
     return tableName;
   }
 }

Diff for: extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java

@@ -26,7 +26,6 @@
 import javax.sql.DataSource;
 import org.apache.polaris.core.PolarisDiagnostics;
 import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.core.entity.*;
 import org.apache.polaris.core.persistence.*;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
@@ -49,11 +48,17 @@ public class JdbcMetaStoreManagerFactory extends LocalPolarisMetaStoreManagerFac
   @Inject PolarisStorageIntegrationProvider storageIntegrationProvider;
 
   protected JdbcMetaStoreManagerFactory() {
-    this(null);
+    this(null, null, null);
   }
 
-  protected JdbcMetaStoreManagerFactory(@Nonnull PolarisDiagnostics diagnostics) {
+  @Inject
+  protected JdbcMetaStoreManagerFactory(
+      @Nonnull PolarisDiagnostics diagnostics,
+      @Nonnull DataSource dataSource,
+      @Nonnull PolarisStorageIntegrationProvider storageIntegrationProvider) {
     super(diagnostics);
+    this.dataSource = dataSource;
+    this.storageIntegrationProvider = storageIntegrationProvider;
   }
 
   /**
@@ -68,11 +73,12 @@ protected PolarisMetaStoreManager createNewMetaStoreManager() {
   @Override
   protected void initializeForRealm(
       RealmContext realmContext, RootCredentialsSet rootCredentialsSet) {
-    DatasourceOperations databaseOperations = new DatasourceOperations(dataSource);
+    DatasourceOperations databaseOperations =
+        new DatasourceOperations(dataSource, realmContext.getRealmIdentifier());
     // TODO: see if we need to take script from Quarkus or can we just
     // use the script committed in the repo.
     try {
-      databaseOperations.executeScript("scripts/postgres/schema-v1-postgres.sql");
+      databaseOperations.executeScript("postgres/schema-v1-postgresql.sql");
     } catch (SQLException e) {
       throw new RuntimeException(
           String.format("Error executing sql script: %s", e.getMessage()), e);

Diff for: extension/persistence/relational-jdbc/src/main/resources/h2/schema-v1-h2.sql

@@ -17,8 +17,6 @@
 -- under the License.
 --
 
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET SCHEMA POLARIS_SCHEMA;
 DROP TABLE IF EXISTS entities;
 CREATE TABLE IF NOT EXISTS entities (
     catalog_id BIGINT NOT NULL,

Diff for: scripts/postgres/schema-v1-postgresql.sql renamed to extension/persistence/relational-jdbc/src/main/resources/postgres/schema-v1-postgresql.sql

@@ -37,8 +37,8 @@ CREATE TABLE IF NOT EXISTS entities (
     purge_timestamp BIGINT NOT NULL,
     to_purge_timestamp BIGINT NOT NULL,
     last_update_timestamp BIGINT NOT NULL,
-    properties JSONB not null default '{}'::JSONB,
-    internal_properties JSONB not null default '{}'::JSONB,
+    properties TEXT NOT NULL default '{}',
+    internal_properties TEXT NOT NULL default '{}',
     grant_records_version INT NOT NULL,
     PRIMARY KEY (id),
     CONSTRAINT constraint_name UNIQUE (catalog_id, parent_id, type_code, name)

Diff for: extension/persistence/relational-jdbc/src/test/java/org/apache/polaris/extension/persistence/impl/relational/jdbc/DatasourceOperationsTest.java

@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.when;
 
 import java.sql.Connection;
+import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -50,13 +51,17 @@ public class DatasourceOperationsTest {
 
   @Mock private ResultSet mockResultSet;
 
+  @Mock private DatabaseMetaData mockDatabaseMetaData;
+
   private DatasourceOperations datasourceOperations;
 
   @BeforeEach
   void setUp() throws Exception {
     when(mockDataSource.getConnection()).thenReturn(mockConnection);
+    when(mockConnection.getMetaData()).thenReturn(mockDatabaseMetaData);
+    when(mockDatabaseMetaData.getDatabaseProductName()).thenReturn("H2");
     when(mockConnection.createStatement()).thenReturn(mockStatement);
-    datasourceOperations = new DatasourceOperations(mockDataSource);
+    datasourceOperations = new DatasourceOperations(mockDataSource, "realm");
   }
 
   @Test

Diff for: extension/persistence/relational-jdbc/src/test/java/org/apache/polaris/extension/persistence/impl/relational/jdbc/JdbcAtomicMetastoreManagerTest.java

@@ -46,11 +46,12 @@ public static DataSource createH2DataSource() {
   @Override
   protected PolarisTestMetaStoreManager createPolarisTestMetaStoreManager() {
     PolarisDiagnostics diagServices = new PolarisDefaultDiagServiceImpl();
-    DatasourceOperations datasourceOperations = new DatasourceOperations(createH2DataSource());
+    DatasourceOperations datasourceOperations =
+        new DatasourceOperations(createH2DataSource(), "REALM");
     try {
       datasourceOperations.executeScript("h2/schema-v1-h2.sql");
     } catch (SQLException e) {
-      throw new RuntimeException(String.format("Error executing h2 script: %s", e.getMessage()), e);
+      throw new RuntimeException(String.format("Error executing h2 script: %s", e.getMessage()));
     }
 
     JdbcBasePersistenceImpl basePersistence =

Diff for: quarkus/admin/build.gradle.kts

@@ -44,7 +44,9 @@ dependencies {
   implementation(project(":polaris-api-iceberg-service"))
 
   runtimeOnly(project(":polaris-eclipselink"))
+  runtimeOnly(project(":polaris-relational-jdbc"))
 
+  implementation("io.quarkus:quarkus-jdbc-postgresql")
   implementation(enforcedPlatform(libs.quarkus.bom))
   implementation("io.quarkus:quarkus-picocli")
   implementation("io.quarkus:quarkus-container-image-docker")

Diff for: quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcBootstrapCommandTest.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.relational.jdbc;
+
+import io.quarkus.test.junit.TestProfile;
+import org.apache.polaris.admintool.BootstrapCommandTestBase;
+
+@TestProfile(RelationalJdbcProfile.class)
+public class RelationalJdbcBootstrapCommandTest extends BootstrapCommandTestBase {}

Diff for: quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcProfile.java

@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.relational.jdbc;
+
+import static org.apache.polaris.admintool.PostgresTestResourceLifecycleManager.INIT_SCRIPT;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+import java.util.List;
+import java.util.Map;
+import org.apache.polaris.admintool.PostgresRelationalJdbcLifeCycleManagement;
+
+public class RelationalJdbcProfile implements QuarkusTestProfile {
+  @Override
+  public Map<String, String> getConfigOverrides() {
+    return Map.of();
+  }
+
+  @Override
+  public List<TestResourceEntry> testResources() {
+    return List.of(
+        new TestResourceEntry(
+            PostgresRelationalJdbcLifeCycleManagement.class,
+            Map.of(INIT_SCRIPT, "org/apache/polaris/admintool/relational-jdbc/init.sql")));
+  }
+}

Diff for: quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java

@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.relational.jdbc;
+
+import io.quarkus.test.junit.TestProfile;
+import java.util.Map;
+import org.apache.polaris.admintool.PurgeCommandTestBase;
+import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
+
+@TestProfile(RelationalJdbcPurgeCommandTest.Profile.class)
+public class RelationalJdbcPurgeCommandTest extends PurgeCommandTestBase {
+  public static class Profile extends RelationalJdbcProfile {
+    @Override
+    public Map<String, String> getConfigOverrides() {
+      return ImmutableMap.<String, String>builder()
+          .putAll(super.getConfigOverrides())
+          .put("pre-bootstrap", "true")
+          .build();
+    }
+  }
+}