[JDBC] [DO NOT REVIEW] Support multiple Quarkus datasources

bom/build.gradle.kts

@@ -46,7 +46,8 @@ dependencies {
     api(project(":polaris-jpa-model"))
 
     api(project(":polaris-quarkus-admin"))
-    api(project(":polaris-quarkus-test-commons"))
+    api(project(":polaris-quarkus-common"))
+    api(project(":polaris-quarkus-test-common"))
     api(project(":polaris-quarkus-defaults"))
     api(project(":polaris-quarkus-server"))
     api(project(":polaris-quarkus-service"))

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

@@ -38,7 +38,8 @@
 
 public class DatasourceOperations {
 
-  private static final String CONSTRAINT_VIOLATION_SQL_CODE = "23505";
+  private static final String CONSTRAINT_VIOLATION_SQL_CODE_POSTGRES = "23505";
+  private static final String TABLE_DOES_NOT_EXIST_SQL_CODE_POSTGRES = "42P01";
 
   private final DataSource datasource;
 
@@ -182,7 +183,11 @@ public interface TransactionCallback {
   }
 
   public boolean isConstraintViolation(SQLException e) {
-    return CONSTRAINT_VIOLATION_SQL_CODE.equals(e.getSQLState());
+    return CONSTRAINT_VIOLATION_SQL_CODE_POSTGRES.equals(e.getSQLState());
+  }
+
+  public boolean isTableNotExists(SQLException e) {
+    return TABLE_DOES_NOT_EXIST_SQL_CODE_POSTGRES.equals(e.getSQLState());
   }
 
   private Connection borrowConnection() throws SQLException {

extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcBasePersistenceImpl.java

@@ -315,6 +315,12 @@ private PolarisBaseEntity getPolarisBaseEntity(String query) {
         return results.getFirst();
       }
     } catch (SQLException e) {
+      // This look-up is used for checking if the realm is bootstrap or not.
+      // If we have 1 DB per realm it might happen that the realm is not boostrap
+      // at all.
+      if (datasourceOperations.isTableNotExists(e)) {
+        return null;
+      }
       throw new RuntimeException(
           String.format("Failed to retrieve polaris entity due to %s", e.getMessage()), e);
     }

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

@@ -21,7 +21,6 @@
 import io.smallrye.common.annotation.Identifier;
 import jakarta.annotation.Nullable;
 import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -41,6 +40,7 @@
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
 import org.apache.polaris.core.persistence.AtomicOperationMetaStoreManager;
 import org.apache.polaris.core.persistence.BasePersistence;
+import org.apache.polaris.core.persistence.DatasourceSupplier;
 import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
 import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
 import org.apache.polaris.core.persistence.PrincipalSecretsGenerator;
@@ -73,7 +73,7 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
   protected final PolarisDiagnostics diagServices = new PolarisDefaultDiagServiceImpl();
 
   @Inject PolarisStorageIntegrationProvider storageIntegrationProvider;
-  @Inject Instance<DataSource> dataSource;
+  @Inject DatasourceSupplier jdbcDatasource;
 
   protected JdbcMetaStoreManagerFactory() {}
 
@@ -93,7 +93,8 @@ protected PolarisMetaStoreManager createNewMetaStoreManager() {
 
   private void initializeForRealm(
       RealmContext realmContext, RootCredentialsSet rootCredentialsSet, boolean isBootstrap) {
-    DatasourceOperations databaseOperations = getDatasourceOperations(isBootstrap);
+    DatasourceOperations databaseOperations =
+        getDatasourceOperations(isBootstrap, realmContext.getRealmIdentifier());
     sessionSupplierMap.put(
         realmContext.getRealmIdentifier(),
         () ->
@@ -107,12 +108,13 @@ private void initializeForRealm(
     metaStoreManagerMap.put(realmContext.getRealmIdentifier(), metaStoreManager);
   }
 
-  private DatasourceOperations getDatasourceOperations(boolean isBootstrap) {
-    DatasourceOperations databaseOperations = new DatasourceOperations(dataSource.get());
+  private DatasourceOperations getDatasourceOperations(boolean isBootstrap, String realmId) {
+    DataSource datasource = jdbcDatasource.fromRealmId(realmId);
+    DatasourceOperations databaseOperations = new DatasourceOperations(datasource);
     if (isBootstrap) {
       try {
         DatabaseType databaseType;
-        try (Connection connection = dataSource.get().getConnection()) {
+        try (Connection connection = datasource.getConnection()) {
           String productName = connection.getMetaData().getDatabaseProductName();
           databaseType = DatabaseType.fromDisplayName(productName);
         }

gradle/projects.main.properties

@@ -30,7 +30,8 @@ polaris-quarkus-service=quarkus/service
 polaris-quarkus-server=quarkus/server
 polaris-quarkus-spark-tests=quarkus/spark-tests
 polaris-quarkus-admin=quarkus/admin
-polaris-quarkus-test-commons=quarkus/test-commons
+polaris-quarkus-common=quarkus/common
+polaris-quarkus-test-common=quarkus/test-common
 polaris-quarkus-run-script=quarkus/run-script
 polaris-eclipselink=extension/persistence/eclipselink
 polaris-jpa-model=extension/persistence/jpa-model

polaris-core/src/main/java/org/apache/polaris/core/persistence/DatasourceSupplier.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.core.persistence;
+
+import javax.sql.DataSource;
+
+public interface DatasourceSupplier {
+  DataSource fromRealmId(String realmId);
+}

quarkus/admin/build.gradle.kts

@@ -46,15 +46,15 @@ dependencies {
   runtimeOnly(project(":polaris-eclipselink"))
   runtimeOnly(project(":polaris-relational-jdbc"))
   runtimeOnly("org.postgresql:postgresql")
-
   implementation("io.quarkus:quarkus-jdbc-postgresql")
   implementation(enforcedPlatform(libs.quarkus.bom))
   implementation("io.quarkus:quarkus-picocli")
   implementation("io.quarkus:quarkus-container-image-docker")
 
   implementation("org.jboss.slf4j:slf4j-jboss-logmanager")
 
-  testImplementation(project(":polaris-quarkus-test-commons"))
+  implementation(project(":polaris-quarkus-common"))
+  testImplementation(project(":polaris-quarkus-test-common"))
   testFixturesApi(project(":polaris-core"))
 
   testFixturesApi(enforcedPlatform(libs.quarkus.bom))

quarkus/admin/src/main/resources/application.properties

@@ -50,3 +50,21 @@ quarkus.index-dependency.guava.artifact-id=guava
 quarkus.index-dependency.protobuf.group-id=com.google.protobuf
 quarkus.index-dependency.protobuf.artifact-id=protobuf-java
 quarkus.datasource.devservices.image-name=postgres:17-alpine
+
+#quarkus.datasource.db-kind=pgsql
+#quarkus.datasource.jdbc.url=polaris
+#quarkus.datasource.username=polaris
+#quarkus.datasource.password=polaris
+quarkus.datasource.\"realm1_ds\".db-kind=pgsql
+quarkus.datasource.\"realm1_ds\".jdbc.url=polaris
+quarkus.datasource.\"realm1_ds\".username=polaris
+quarkus.datasource.\"realm1_ds\".password=polaris
+quarkus.datasource.\"realm2_ds\".db-kind=pgsql
+quarkus.datasource.\"realm2_ds\".jdbc.url=polaris
+quarkus.datasource.\"realm2_ds\".username=polaris
+quarkus.datasource.\"realm2_ds\".password=polaris
+quarkus.datasource.\"realm3_ds\".db-kind=pgsql
+quarkus.datasource.\"realm3_ds\".jdbc.url=polaris
+quarkus.datasource.\"realm3_ds\".username=polaris
+quarkus.datasource.\"realm3_ds\".password=polaris
+

quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcAdminProfile.java

@@ -22,8 +22,8 @@
 
 import java.util.List;
 import java.util.Map;
-import org.apache.polaris.test.commons.PostgresRelationalJdbcLifeCycleManagement;
-import org.apache.polaris.test.commons.RelationalJdbcProfile;
+import org.apache.polaris.test.common.PostgresRelationalJdbcLifeCycleManagement;
+import org.apache.polaris.test.common.RelationalJdbcProfile;
 
 public class RelationalJdbcAdminProfile extends RelationalJdbcProfile {
   @Override
@@ -36,6 +36,10 @@ public List<TestResourceEntry> testResources() {
     return List.of(
         new TestResourceEntry(
             PostgresRelationalJdbcLifeCycleManagement.class,
-            Map.of(INIT_SCRIPT, "org/apache/polaris/admintool/init.sql")));
+            Map.of(
+                INIT_SCRIPT,
+                "org/apache/polaris/admintool/jdbc/init.sql",
+                "databases",
+                "realm1,realm2,realm3")));
   }
 }

quarkus/admin/src/testFixtures/resources/org/apache/polaris/admintool/jdbc/init.sql

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+-- Create two more databases for testing. The first database, polaris_realm1, is created
+-- during container initialization. See PostgresTestResourceLifecycleManager.
+
+-- Note: the database names must follow the pattern polaris_{realm}. That's the pattern
+-- specified by the persistence.xml file used in tests.
+
+CREATE DATABASE realm2;
+GRANT ALL PRIVILEGES ON DATABASE realm2 TO polaris;
+
+CREATE DATABASE realm3;
+GRANT ALL PRIVILEGES ON DATABASE realm3 TO polaris;

quarkus/common/build.gradle.kts

@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+plugins {
+  alias(libs.plugins.jandex)
+  id("java-test-fixtures")
+}
+
+configurations.all {
+  exclude(group = "org.antlr", module = "antlr4-runtime")
+  exclude(group = "org.scala-lang", module = "scala-library")
+  exclude(group = "org.scala-lang", module = "scala-reflect")
+}
+
+java {
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
+}
+
+dependencies {
+  implementation(project(":polaris-core"))
+  implementation(project(":polaris-relational-jdbc"))
+
+  compileOnly(libs.smallrye.config.core) // @ConfigMap
+  implementation(enforcedPlatform(libs.quarkus.bom))
+  implementation("io.quarkus:quarkus-arc")
+}

quarkus/common/src/main/java/org/apache/polaris/common/QuarkusDatasourceSupplier.java

@@ -0,0 +1,71 @@
+/*
+ * 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.common;
+
+import io.quarkus.arc.All;
+import io.quarkus.arc.InstanceHandle;
+import java.util.List;
+import javax.sql.DataSource;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import org.apache.polaris.core.persistence.DatasourceSupplier;
+
+@ApplicationScoped
+public class QuarkusDatasourceSupplier implements DatasourceSupplier {
+  private final List<InstanceHandle<DataSource>> dataSources;
+  private final RelationalJdbcConfiguration relationalJdbcConfiguration;
+
+  private static final String DEFAULT_DATA_SOURCE_NAME = "default";
+
+  @Inject
+  public QuarkusDatasourceSupplier(
+      RelationalJdbcConfiguration relationalJdbcConfiguration,
+      @All List<InstanceHandle<DataSource>> dataSources) {
+    this.relationalJdbcConfiguration = relationalJdbcConfiguration;
+    this.dataSources = dataSources;
+  }
+
+  @Override
+  public DataSource fromRealmId(String realmId) {
+    // check if the mapping of realm to DS exists, otherwise fall back to default
+    String dataSourceName = relationalJdbcConfiguration.realms().getOrDefault(
+            realmId,
+            relationalJdbcConfiguration.defaultDatasource().orElse(null)
+    );
+
+    // if neither mapping exists nor default DS exists, fail
+    if (dataSourceName == null) {
+      throw new IllegalStateException(String.format(
+              "No datasource configured with name: %s nor default datasource configured", realmId));
+    }
+
+    // check if there is actually a datasource of that dataSourceName
+    return dataSources.stream()
+            .filter(ds -> {
+              String name = ds.getBean().getName();
+              name = name == null ? DEFAULT_DATA_SOURCE_NAME : name;
+              return name.equals(dataSourceName);
+            })
+            .map(InstanceHandle::get)
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException(String.format(
+                    "No datasource configured with name: %s", dataSourceName)));
+  }
+}

quarkus/common/src/main/java/org/apache/polaris/common/RelationalJdbcConfiguration.java

@@ -0,0 +1,38 @@
+/*
+ * 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.common;
+
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithParentName;
+
+import java.util.Map;
+import java.util.Optional;
+
+@ConfigMapping(prefix = "polaris.relational.jdbc.datasource")
+public interface RelationalJdbcConfiguration {
+  /** realmId to configured Datasource name mapping. */
+  @WithParentName
+  Map<String, String> realms();
+
+  /**
+   * Default datasource name to be used for a realmId when there is no mapping of realmId to
+   * Datasource name present.
+   */
+  Optional<String> defaultDatasource();
+}

quarkus/defaults/src/main/resources/application-it.properties

@@ -46,4 +46,7 @@ polaris.realm-context.realms=POLARIS,OTHER
 
 polaris.storage.gcp.token=token
 polaris.storage.gcp.lifespan=PT1H
-
+quarkus.datasource.realm1_ds.db-kind=pgsql
+quarkus.datasource.realm1_ds.jdbc.url=polaris
+quarkus.datasource.realm1_ds.username=polaris
+quarkus.datasource.realm1_ds.password=polaris