[WIP] Quarkus-based Polaris service runtime

Dockerfile

@@ -32,16 +32,36 @@ WORKDIR /app
 RUN rm -rf build
 
 # Build the rest catalog
-RUN ./gradlew --no-daemon --info ${ECLIPSELINK_DEPS+"-PeclipseLinkDeps=$ECLIPSELINK_DEPS"} -PeclipseLink=$ECLIPSELINK clean prepareDockerDist
+RUN ./gradlew --no-daemon --info ${ECLIPSELINK_DEPS+"-PeclipseLinkDeps=$ECLIPSELINK_DEPS"} -PeclipseLink=$ECLIPSELINK clean :polaris-service:build -x test
 
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.20-2.1729089285
-WORKDIR /app
-COPY --from=build /app/polaris-service/build/docker-dist/bin /app/bin
-COPY --from=build /app/polaris-service/build/docker-dist/lib /app/lib
-COPY --from=build /app/polaris-server.yml /app
+FROM registry.access.redhat.com/ubi9/openjdk-21:1.20-2.1726695192
+
+LABEL org.opencontainers.image.source=https://github.com/apache/polaris
+LABEL org.opencontainers.image.description="Apache Polaris"
+LABEL org.opencontainers.image.licenses=Apache-2.0
+
+ENV LANGUAGE='en_US:en'
+
+USER root
+RUN groupadd --gid 10001 polaris \
+      && useradd --uid 10000 --gid polaris polaris \
+      && chown -R polaris:polaris /opt/jboss/container \
+      && chown -R polaris:polaris /deployments
+
+USER polaris
+WORKDIR /home/polaris
+ENV USER=polaris
+ENV UID=10000
+ENV HOME=/home/polaris
+
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --from=build --chown=polaris:polaris /app/polaris-service/build/quarkus-app/lib/ /deployments/lib/
+COPY --from=build --chown=polaris:polaris /app/polaris-service/build/quarkus-app/*.jar /deployments/
+COPY --from=build --chown=polaris:polaris /app/polaris-service/build/quarkus-app/app/ /deployments/app/
+COPY --from=build --chown=polaris:polaris /app/polaris-service/build/quarkus-app/quarkus/ /deployments/quarkus/
 
 EXPOSE 8181
+EXPOSE 8182
 
-# Run the resulting java binary
-ENTRYPOINT ["/app/bin/polaris-service"]
-CMD ["server", "polaris-server.yml"]
+ENV AB_JOLOKIA_OFF=""
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"

build.gradle.kts

@@ -84,7 +84,7 @@ tasks.named<RatTask>("rat").configure {
   excludes.add("gradle/wrapper/gradle-wrapper*.jar*")
 
   excludes.add("logs/**")
-  excludes.add("polaris-service/src/**/banner.txt")
+  excludes.add("polaris-service/src/**/polaris-banner.txt")
   excludes.add("polaris-service/logs")
 
   excludes.add("site/node_modules/**")

docker-compose.yml

@@ -26,12 +26,14 @@ services:
       - "8182"
     environment:
       AWS_REGION: us-west-2
+      AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID
+      AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY
       GOOGLE_APPLICATION_CREDENTIALS: $GOOGLE_APPLICATION_CREDENTIALS
       AZURE_TENANT_ID: $AZURE_TENANT_ID
       AZURE_CLIENT_ID: $AZURE_CLIENT_ID
       AZURE_CLIENT_SECRET: $AZURE_CLIENT_SECRET
-      # add aws keys as dropwizard config
-      JAVA_OPTS: -Ddw.awsAccessKey=$AWS_ACCESS_KEY_ID -Ddw.awsSecretKey=$AWS_SECRET_ACCESS_KEY
+      POLARIS_AUTHENTICATION_TYPE: test
+      POLARIS_AUTHENTICATION_OAUTH2_SERVICE_TYPE: test
     volumes:
       - ./regtests/credentials:/tmp/credentials/
 

extension/persistence/eclipselink/build.gradle.kts

@@ -23,15 +23,16 @@ fun isValidDep(dep: String): Boolean {
 }
 
 plugins {
+  alias(libs.plugins.quarkus)
   id("polaris-server")
   `java-library`
 }
 
 dependencies {
   implementation(project(":polaris-core"))
   implementation(libs.eclipselink)
-  implementation(platform(libs.dropwizard.bom))
-  implementation("io.dropwizard:dropwizard-jackson")
+  implementation(enforcedPlatform(libs.quarkus.bom))
+
   val eclipseLinkDeps: String? = project.findProperty("eclipseLinkDeps") as String?
   eclipseLinkDeps?.let {
     val dependenciesList = it.split(",")
@@ -46,14 +47,20 @@ dependencies {
   }
 
   compileOnly(libs.jetbrains.annotations)
+  compileOnly(libs.jakarta.enterprise.cdi.api)
+  compileOnly(libs.jakarta.inject.api)
+  compileOnly("io.quarkus:quarkus-arc")
+  compileOnly("org.eclipse.microprofile.config:microprofile-config-api")
+  compileOnly(platform(libs.jackson.bom))
+  compileOnly("com.fasterxml.jackson.core:jackson-annotations")
+  compileOnly("com.fasterxml.jackson.core:jackson-core")
 
   testImplementation(libs.h2)
   testImplementation(testFixtures(project(":polaris-core")))
 
   testImplementation(platform(libs.junit.bom))
-  testImplementation("org.junit.jupiter:junit-jupiter")
-  testImplementation(libs.assertj.core)
-  testImplementation(libs.mockito.core)
+  testImplementation(libs.bundles.junit.testing)
+  testRuntimeOnly("org.junit.jupiter:junit-jupiter")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
@@ -65,3 +72,7 @@ tasks.register<Jar>("archiveConf") {
 }
 
 tasks.named("test") { dependsOn("archiveConf") }
+
+tasks.named("compileJava") { dependsOn("compileQuarkusGeneratedSourcesJava") }
+
+tasks.named("sourcesJar") { dependsOn("compileQuarkusGeneratedSourcesJava") }

extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java

@@ -18,28 +18,37 @@
  */
 package org.apache.polaris.extension.persistence.impl.eclipselink;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import io.quarkus.arc.lookup.LookupIfProperty;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.apache.polaris.core.PolarisDiagnostics;
+import org.apache.polaris.core.config.RuntimeCandidate;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
 import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
 import org.apache.polaris.core.persistence.PolarisMetaStoreSession;
+import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * The implementation of Configuration interface for configuring the {@link PolarisMetaStoreManager}
  * using an EclipseLink based meta store to store and retrieve all Polaris metadata. It can be
  * configured through persistence.xml to use supported RDBMS as the meta store.
  */
-@JsonTypeName("eclipse-link")
+@ApplicationScoped
+@RuntimeCandidate
+@LookupIfProperty(name = "polaris.persistence.metastore-manager.type", stringValue = "eclipse-link")
 public class EclipseLinkPolarisMetaStoreManagerFactory
     extends LocalPolarisMetaStoreManagerFactory<PolarisEclipseLinkStore> {
-  @JsonProperty("conf-file")
-  private String confFile;
 
-  @JsonProperty("persistence-unit")
-  private String persistenceUnitName;
+  @ConfigProperty(name = "polaris.eclipselink.conf-file")
+  String confFile;
+
+  @ConfigProperty(name = "polaris.eclipselink.persistence-unit", defaultValue = "polaris")
+  String persistenceUnitName;
+
+  @Inject PolarisStorageIntegrationProvider storageIntegration;
 
   @Override
   protected PolarisEclipseLinkStore createBackingStore(@NotNull PolarisDiagnostics diagnostics) {

extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java

@@ -21,7 +21,6 @@
 import static org.eclipse.persistence.config.PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML;
 import static org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_URL;
 
-import com.google.common.base.Predicates;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityTransaction;
@@ -523,7 +522,7 @@ public List<PolarisEntityActiveRecord> lookupEntityActiveBatch(
       long catalogId,
       long parentId,
       @NotNull PolarisEntityType entityType) {
-    return listActiveEntities(callCtx, catalogId, parentId, entityType, Predicates.alwaysTrue());
+    return listActiveEntities(callCtx, catalogId, parentId, entityType, x -> true);
   }
 
   @Override

gradle.properties

@@ -28,4 +28,4 @@ org.gradle.configureondemand=true
 org.gradle.configuration-cache=false
 #org.gradle.configuration-cache-problems=warn
 # bump the Gradle daemon heap size (you can set bigger heap sizes as well)
-org.gradle.jvmargs=-Xms2g -Xmx4g -XX:MaxMetaspaceSize=768m
+org.gradle.jvmargs=-Xms2g -Xmx4g -XX:MaxMetaspaceSize=768m

gradle/libs.versions.toml

@@ -20,11 +20,13 @@
 [versions]
 hadoop = "3.4.0"
 iceberg = "1.6.1"
-dropwizard = "4.0.8"
+junit = "5.10.3"
+quarkus = "3.16.4"
 slf4j = "2.0.13"
 swagger = "1.6.14"
 
 [bundles]
+junit-testing = ["assertj-core", "mockito-core", "mockito-junit-jupiter", "junit-jupiter-api", "junit-jupiter-params", "junit-platform-reporting"]
 
 
 [libraries]
@@ -40,30 +42,40 @@ bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version = "1
 caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.1.8" }
 commons-codec1 = { module = "commons-codec:commons-codec", version = "1.17.1" }
 commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.17.0" }
-dropwizard-bom = { module = "io.dropwizard:dropwizard-bom", version.ref = "dropwizard" }
 eclipselink = { module = "org.eclipse.persistence:eclipselink", version = "4.0.4" }
 errorprone = { module = "com.google.errorprone:error_prone_core", version = "2.29.2" }
 google-cloud-storage-bom = { module = "com.google.cloud:google-cloud-storage-bom", version = "2.42.0" }
 guava = { module = "com.google.guava:guava", version = "33.3.0-jre" }
 h2 = { module = "com.h2database:h2", version = "2.3.232" }
 hadoop-client-api = { module = "org.apache.hadoop:hadoop-client-api", version.ref = "hadoop" }
+hadoop-client-runtime = { module = "org.apache.hadoop:hadoop-client-runtime", version.ref = "hadoop" }
 hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref = "hadoop" }
 hadoop-hdfs-client = { module = "org.apache.hadoop:hadoop-hdfs-client", version.ref = "hadoop" }
 iceberg-bom = { module = "org.apache.iceberg:iceberg-bom", version.ref = "iceberg" }
 jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version = "2.17.2" }
 jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version = "3.0.0" }
-jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api", version = "3.1.0" }
+jakarta-enterprise-cdi-api = { module = "jakarta.enterprise:jakarta.enterprise.cdi-api", version = "4.1.0" }
+jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" }
 jakarta-persistence-api = { module = "jakarta.persistence:jakarta.persistence-api", version = "3.1.0" }
+jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" }
+jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api", version = "3.0.2" }
+jakarta-ws-rs-api = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version = "3.1.0" }
 javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" }
 javax-inject = { module = "javax.inject:javax.inject", version = "1" }
+javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version = "24.1.0" }
-junit-bom = { module = "org.junit:junit-bom", version = "5.10.3" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
+junit-platform-reporting = { module = "org.junit.platform:junit-platform-reporting", version = "1.10.3" }
 logback-core = { module = "ch.qos.logback:logback-core", version = "1.4.14" }
 micrometer-bom = { module = "io.micrometer:micrometer-bom", version = "1.13.6" }
 mockito-core = { module = "org.mockito:mockito-core", version = "5.11.0" }
+mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version = "5.11.0" }
 opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version = "1.38.0" }
 opentelemetry-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version = "1.25.0-alpha" }
 prometheus-metrics-exporter-servlet-jakarta = { module = "io.prometheus:prometheus-metrics-exporter-servlet-jakarta", version = "1.3.0" }
+quarkus-bom = { module = "io.quarkus.platform:quarkus-bom", version.ref = "quarkus" }
 s3mock-testcontainers = { module = "com.adobe.testing:s3mock-testcontainers", version = "3.11.0" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version = "4.8.5" }
@@ -74,5 +86,6 @@ threeten-extra = { module = "org.threeten:threeten-extra", version = "1.8.0" }
 
 [plugins]
 openapi-generator = { id = "org.openapi.generator", version = "7.6.0" }
+quarkus = { id = "io.quarkus", version.ref = "quarkus" }
 rat = { id = "org.nosphere.apache.rat", version = "0.8.1" }
 spotless = { id = "com.diffplug.spotless", version = "6.25.0" }

polaris-core/build.gradle.kts

@@ -24,6 +24,7 @@ plugins {
   id("polaris-client")
   id("java-library")
   id("java-test-fixtures")
+  id("org.kordamp.gradle.jandex") version "2.1.0"
 }
 
 dependencies {
@@ -33,10 +34,6 @@ dependencies {
   constraints {
     implementation("io.airlift:aircompressor:0.27") { because("Vulnerability detected in 0.25") }
   }
-  // TODO - this is only here for the Discoverable interface
-  // We should use a different mechanism to discover the plugin implementations
-  implementation(platform(libs.dropwizard.bom))
-  implementation("io.dropwizard:dropwizard-jackson")
 
   implementation(platform(libs.jackson.bom))
   implementation("com.fasterxml.jackson.core:jackson-annotations")
@@ -49,6 +46,7 @@ dependencies {
   implementation(libs.slf4j.api)
   compileOnly(libs.jetbrains.annotations)
   compileOnly(libs.spotbugs.annotations)
+  compileOnly(libs.jakarta.inject.api) // FIXME remove when RuntimeCandidate is removed
 
   constraints {
     implementation("org.xerial.snappy:snappy-java:1.1.10.4") {
@@ -102,15 +100,14 @@ dependencies {
   implementation("io.micrometer:micrometer-core")
 
   testFixturesApi(platform(libs.junit.bom))
-  testFixturesApi("org.junit.jupiter:junit-jupiter")
-  testFixturesApi(libs.assertj.core)
-  testFixturesApi(libs.mockito.core)
+  testFixturesApi(libs.bundles.junit.testing)
   testFixturesApi("com.fasterxml.jackson.core:jackson-core")
   testFixturesApi("com.fasterxml.jackson.core:jackson-databind")
   testFixturesApi(libs.commons.lang3)
   testFixturesApi(libs.threeten.extra)
   testFixturesApi(libs.jetbrains.annotations)
   testFixturesApi(platform(libs.jackson.bom))
+  testRuntimeOnly("org.junit.jupiter:junit-jupiter")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
   compileOnly(libs.jakarta.annotation.api)
@@ -150,3 +147,5 @@ listOf("sourcesJar", "compileJava").forEach { task ->
 sourceSets {
   main { java { srcDir(project.layout.buildDirectory.dir("generated/src/main/java")) } }
 }
+
+tasks.named("javadoc") { dependsOn("jandex") }

polaris-core/src/main/java/org/apache/polaris/core/PolarisCallContext.java

@@ -58,6 +58,11 @@ public PolarisCallContext(
     this.clock = Clock.system(ZoneId.systemDefault());
   }
 
+  public static PolarisCallContext copyOf(PolarisCallContext base) {
+    return new PolarisCallContext(
+        base.getMetaStore(), base.getDiagServices(), base.getConfigurationStore(), base.getClock());
+  }
+
   public PolarisMetaStoreSession getMetaStore() {
     return metaStore;
   }

polaris-service/src/test/java/org/apache/polaris/service/test/PolarisRealm.java → polaris-core/src/main/java/org/apache/polaris/core/config/RuntimeCandidate.java

@@ -16,17 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.service.test;
+package org.apache.polaris.core.config;
 
-import java.lang.annotation.ElementType;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import jakarta.inject.Qualifier;
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Annotation used to specify where to inject the Polaris test realm identifier. This is provided by
- * PolarisConnectionExtension.
- */
-@Target({ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PolarisRealm {}
+/** Qualifier for candidate beans that are resolved at runtime based on configuration properties. */
+@Qualifier
+@Retention(RUNTIME)
+@Target({TYPE, METHOD, FIELD, PARAMETER})
+@Documented
+// FIXME remove or replace
+public @interface RuntimeCandidate {}

polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java

@@ -100,8 +100,8 @@ public Map<String, Object> contextVariables() {
    * CallContext}.
    */
   static CallContext copyOf(CallContext base) {
-    RealmContext realmContext = base.getRealmContext();
-    PolarisCallContext polarisCallContext = base.getPolarisCallContext();
+    RealmContext realmContext = RealmContext.copyOf(base.getRealmContext());
+    PolarisCallContext polarisCallContext = PolarisCallContext.copyOf(base.getPolarisCallContext());
     Map<String, Object> contextVariables =
         base.contextVariables().entrySet().stream()
             .filter(e -> !e.getKey().equals(CLOSEABLES))
@@ -142,16 +142,16 @@ public Map<String, Object> contextVariables() {
   default void close() {
     if (CURRENT_CONTEXT.get() == this) {
       unsetCurrentContext();
-      CloseableGroup closeables = closeables();
-      try {
-        closeables.close();
-      } catch (IOException e) {
-        Logger logger = LoggerFactory.getLogger(CallContext.class);
-        logger
-            .atWarn()
-            .addKeyValue("closeableGroup", closeables)
-            .log("Unable to close closeable group", e);
-      }
+    }
+    CloseableGroup closeables = closeables();
+    try {
+      closeables.close();
+    } catch (IOException e) {
+      Logger logger = LoggerFactory.getLogger(CallContext.class);
+      logger
+          .atWarn()
+          .addKeyValue("closeableGroup", closeables)
+          .log("Unable to close closeable group", e);
     }
   }
 }