Skip to content

Move JDBC Quarkus configuration to the JDBC persistence module #3281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flyrain wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Move JDBC Quarkus configuration to the JDBC persistence module #3281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bfe6530
Remove module polaris-runtime-common
flyrain Dec 16, 2025
715652c
Remove module polaris-runtime-common
flyrain Dec 16, 2025
e4ebacc
Resolve comments
flyrain Dec 16, 2025
9599cff
Resolve comments
flyrain Dec 18, 2025
dc4e343
Fix a hidden bug
flyrain Dec 18, 2025
11a71cb
Fix a hidden bug
flyrain Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bom/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ dependencies {
api(project(":polaris-extensions-auth-opa"))

api(project(":polaris-admin"))
api(project(":polaris-runtime-common"))
api(project(":polaris-runtime-test-common"))
api(project(":polaris-runtime-defaults"))
api(project(":polaris-server"))
Expand Down
1 change: 0 additions & 1 deletion gradle/projects.main.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ polaris-server=runtime/server
polaris-distribution=runtime/distribution
polaris-runtime-spark-tests=runtime/spark-tests
polaris-admin=runtime/admin
polaris-runtime-common=runtime/common
polaris-runtime-test-common=runtime/test-common
polaris-relational-jdbc=persistence/relational-jdbc
polaris-tests=integration-tests
Expand Down
1 change: 1 addition & 0 deletions persistence/relational-jdbc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies {
compileOnly(libs.jakarta.enterprise.cdi.api)
compileOnly(libs.jakarta.inject.api)

compileOnly(libs.smallrye.config.core) // @ConfigMapping for Quarkus integration
implementation(libs.smallrye.common.annotation) // @Identifier
implementation(libs.postgresql)

Expand Down
24 changes: 15 additions & 9 deletions ...main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,21 @@ public Map<String, BaseResult> purgeRealms(Iterable<String> realms) {

for (String realm : realms) {
RealmContext realmContext = () -> realm;
PolarisMetaStoreManager metaStoreManager = getOrCreateMetaStoreManager(realmContext);
BasePersistence session = getOrCreateSession(realmContext);

PolarisCallContext callContext = new PolarisCallContext(realmContext, session);
BaseResult result = metaStoreManager.purge(callContext);
results.put(realm, result);

sessionSupplierMap.remove(realm);
metaStoreManagerMap.remove(realm);
try {
PolarisMetaStoreManager metaStoreManager = getOrCreateMetaStoreManager(realmContext);
BasePersistence session = getOrCreateSession(realmContext);

PolarisCallContext callContext = new PolarisCallContext(realmContext, session);
BaseResult result = metaStoreManager.purge(callContext);
results.put(realm, result);

sessionSupplierMap.remove(realm);
metaStoreManagerMap.remove(realm);
} catch (IllegalStateException e) {
// Realm is not bootstrapped, return a failed result
results.put(
realm, new BaseResult(BaseResult.ReturnStatus.ENTITY_NOT_FOUND, e.getMessage()));
}
}

return Map.copyOf(results);
Expand Down
2 changes: 2 additions & 0 deletions ...main/java/org/apache/polaris/persistence/relational/jdbc/RelationalJdbcConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
*/
package org.apache.polaris.persistence.relational.jdbc;

import io.smallrye.config.ConfigMapping;
import java.util.Optional;

@ConfigMapping(prefix = "polaris.persistence.relational.jdbc")
Copy link
Contributor

@dimas-b dimas-b Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not oppose this change, but I'd like to highlight that this will impose the config naming convention defined in this annotation on downstream projects. It may be possible to provide a different config object for JDBC downstream or it may not be... I cannot say for sure.

Old code delegated runtime configuration to the server runtime, so this may be a behaviour change in downstream projects.

Given that NoSQL code follows a similar approach (not splitting interfaces and @ConfigMapping) this change looks reasonable to me.

public interface RelationalJdbcConfiguration {
// max retries before giving up
Optional<Integer> maxRetries();
Expand Down
3 changes: 1 addition & 2 deletions runtime/admin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies {
implementation(project(":polaris-version"))
implementation(project(":polaris-api-management-service"))
implementation(project(":polaris-api-iceberg-service"))
implementation(project(":polaris-runtime-defaults"))

compileOnly("com.fasterxml.jackson.core:jackson-annotations")

Expand All @@ -40,8 +41,6 @@ dependencies {
implementation("io.quarkus:quarkus-picocli")
implementation("io.quarkus:quarkus-container-image-docker")

implementation(project(":polaris-runtime-common"))

testImplementation(project(":polaris-runtime-test-common"))
testFixturesApi(project(":polaris-core"))

Expand Down
30 changes: 0 additions & 30 deletions runtime/common/build.gradle.kts
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions ...ava/org/apache/polaris/quarkus/common/config/jdbc/QuarkusRelationalJdbcConfiguration.java
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions runtime/defaults/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ dependencies {
compileOnly("io.quarkus:quarkus-oidc")
compileOnly("io.quarkus:quarkus-opentelemetry")
compileOnly("io.quarkus:quarkus-smallrye-context-propagation")

implementation(platform(libs.quarkus.amazon.services.bom))
implementation("io.quarkiverse.amazonservices:quarkus-amazon-rds")
}
1 change: 0 additions & 1 deletion runtime/service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ dependencies {
runtimeOnly(project(":polaris-relational-jdbc"))

implementation(project(":polaris-runtime-defaults"))
implementation(project(":polaris-runtime-common"))

compileOnly(project(":polaris-immutables"))
annotationProcessor(project(":polaris-immutables", configuration = "processor"))
Expand Down