Dremio merge 2025 06 20 17 35 (#87)

* Cleanup unnecessary files in client/python (apache#1878)

Cleanup unnecessary files in `client/python`

* Bump version in version.txt

With the release/1.0.0 branch being cut, we should bump this to reflect the current state of main

* JDBC: Refactor DatabaseOps (apache#1843)

* removes the databaseType computation from JDBCMetastoreManagerFactory to DbOperations
* wraps the bootstrap in a transaction !
* refactor Production Readiness checks for Postgres

* Fix two wrong links in README.md (apache#1879)

* Avoid using org.testcontainers.shaded.** (apache#1876)

* main: Update dependency io.smallrye.config:smallrye-config-core to v3.13.2 (apache#1888)

* main: Update registry.access.redhat.com/ubi9/openjdk-21-runtime Docker tag to v1.22-1.1749462970 (apache#1887)

* main: Update dependency boto3 to v1.38.36 (apache#1886)

* fix(build): Fix deprecation warnings in PolarisIntegrationTestExtension (apache#1895)

* Enable patch version updates for maintained Polaris version (apache#1891)

Polaris 1.x will be a supported/maintained release. It is crucial to apply bug and security fixes to such release branches.

Therefore, this change enables patch-version updates for Polaris 1.*

* Add Polaris community meeting record for 2025-06-12 (apache#1892)

* Do not use relative path inside CLI script

Issue apache#1868 reported that the Polaris script can fail when it's run from an unexpected path. The recent addition of a reference to `./gradlew` looks incorrect here, and should be changed to use an absolute path.

Fixes apache#1868

* feat(build): Add Checkstyle plugin and an IllegalImport rule (apache#1880)

* Python CI: pin mypy version to avoid CI failure due to new release (apache#1903)

Mypy did a new release 1.16.1 and it cause our CI to fail for about 20 minutes due to missing wheel (upload not completed)
```
 | Unable to find installation candidates for mypy (1.16.1)
    | 
    | This is likely not a Poetry issue.
    | 
    |   - 14 candidate(s) were identified for the package
    |   - 14 wheel(s) were skipped as your project's environment does not support the identified abi tags
    | 
    | Solutions:
    | Make sure the lockfile is up-to-date. You can try one of the following;
    | 
    |     1. Regenerate lockfile: poetry lock --no-cache --regenerate
    |     2. Update package     : poetry update --no-cache mypy
    | 
    | If neither works, please first check to verify that the mypy has published wheels available from your configured source that are compatible with your environment- ie. operating system, architecture (x86_64, arm64 etc.), python interpreter.
    | 

```
This PR temporarily restrict the mypy version to avoid the similar issue.

We may consider bring poetry.lock back to git tracking so we won't automatically update test dependencies all the time

* Remove `.github/CODEOWNERS` (apache#1902)

As per this [dev-ML discussion](https://lists.apache.org/thread/jjr5w3hslk755yvxy8b3z45c7094cxdn)

* Rename quarkus as runtime (apache#1695)

* Rename runtime/test-commons to runtime/test-common (for consistency with module name) (apache#1906)

* docs: Add `Polaris Evolution` page (apache#1890)

---------

Co-authored-by: Eric Maynard <emaynard@apache.org>

* feat(ci): Split Java Gradle CI in many jobs to reduce execution time (apache#1897)

* Add webpage for Generic Table support (apache#1889)

* add change

* add comment

* address feedback

* update limitations

* update docs

* update doc

* address feedback

* Improve the parsing and validation of UserSecretReferenceUrns (apache#1840)

This change addresses all the TODOs found the org.polaris.core.secrets package. 
Main changes:

- Create a helper to parse, validate and build the URN strings. 
- Use Regex instead of `String.split()`.
- Add Precondition checks to ensure that the URN is valid and the UserSecretManager matches the expected type. 
- Remove the now unused `GLOBAL_INSTANCE` of the UnsafeInMemorySecretsManager.

Testing 
- Existing `UnsafeInMemorySecretsManagerTest` captures most of the functional changes. 
- Added `UserSecretReferenceUrnHelperTest` to capture the utilities exposed.

* Reuse shadowJar for spark client bundle jar maven publish (apache#1857)

* fix spark client

* fix test failure and address feedback

* fix error

* update regression test

* update classifier name

* address comment

* add change

* update doc

* update build and readme

* add back jr

* udpate dependency

* add change

* update

* update tests

* remove merge service file

* update readme

* update readme

* fix(ci): Remove dummy "build" job from Gradle CI (apache#1911)

Since apache#1897, the jobs in gradle.yaml changed and the "build" job was split into many smaller jobs. But since it was a required job, it couldn't be removed immediately.

* main: Update Quarkus Platform and Group to v3.23.3 (apache#1797)

* main: Update Quarkus Platform and Group to v3.23.3

* Adopt polaris-admin test invocation

---------

Co-authored-by: Robert Stupp <snazy@snazy.de>

* Feature: Rollback compaction on conflict (apache#1285)

Intention is make the catalog smarter, to revert the compaction commits in case of crunch to let the writers who are actually adding or removing the data to the table succeed. In a sense treating compaction as always a lower priority process.

Presently the rest catalog client creates the snapshot and asks the Rest Server to apply the snapshot and gives this in a combination of requirement and update.

Polaris could apply some basic inference and generate some updates to metadata given a property is enabled at a table level, by saying that It will revert back the commit which was created by compaction and let the write succeed.
I had this PR in OSS, which was essentially doing this at the client end, but we think its best if we do this as server end. to support more such clients.

How to use this
Enable a catalog level configuration : polaris.config.rollback.compaction.on-conflicts.enabled when this is enabled polaris will apply the intelligence of rollbacking those REPLACE ops snapshot which have the property of polaris.internal.rollback.compaction.on-conflict in their snapshot summary to resolve conflicts at the server end !
a sample use case is there is a deployment of a Polaris where this config is enabled and there is auto compaction (maintenance job) which is updating the table state, it adds the snapshot summary that polaris.internal.rollback.compaction.on-conflict is true now when a backfill process running for 8 hours want to commit but can't because the compaction job committed before so in this case it will reach out to Polaris and Polaris will see if the snapshot of compation aka replace snapshot has this property if yes roll it back and let the writer succeed !

Devlist: https://lists.apache.org/thread/8k8t77dgk1vc124fnb61932bdp9kf1lc

* NoSQL: nits

* `AutoCloseable` for `PersistenceTestExtension`
* checkstyle adoptions

* fix: unify bootstrap credentials and standardize POLARIS setup (apache#1905)

- unified formatting across docker, gradle
- reverted secret to s3cr3t
- updated docker-compose, README, conftest.py

use POLARIS for consistency across docker, gradle and others.

* Add doc for rollback config (apache#1919)

* Revert "Reuse shadowJar for spark client bundle jar maven publish (apache#1857)" (apache#1921)

…857)"

This reverts commit 1f7f127.

The shadowJar plugin actually stops publish the original jar, which is not what spark client intend to publish for the --package usage. 

Revert it for now, will follow up with a better way to reuse the shadow jar plugin, likely with a separate bundle project

* fix(build): Gradle caching effectively not working (apache#1922)

Using a `custom()` spotless formatter check effectively disables caching, see `com.diffplug.gradle.spotless.FormatExtension#custom(java.lang.String, com.diffplug.spotless.FormatterFunc)` using `globalState`, which is a `NeverUpToDateBetweenRuns`. This change refactors this to be cachable.

We also already have a errorprone rule, so we can get rid entirely of the spotless step.

* Update spark client to use the shaded iceberg-core in iceberg-spark-runtime to avoid spark compatibilities issue (apache#1908)

* add change

* add comment

* update change

* add comment

* add change

* add tests

* add comment

* clean up style check

* update build

* Revert "Reuse shadowJar for spark client bundle jar maven publish (apache#1857)"

This reverts commit 1f7f127.

* Reuse shadowJar for spark client bundle jar maven publish (apache#1857)

* fix spark client

* fix test failure and address feedback

* fix error

* update regression test

* update classifier name

* address comment

* add change

* update doc

* update build and readme

* add back jr

* udpate dependency

* add change

* update

* update tests

* remove merge service file

* update readme

* update readme

* update checkstyl

* rebase with main

* Revert "Reuse shadowJar for spark client bundle jar maven publish (apache#1857)"

This reverts commit 40f4d36.

* update checkstyle

* revert change

* address comments

* trigger tests

* Last merged commit 93938fd

---------

Co-authored-by: Honah (Jonas) J. <honahx@apache.org>
Co-authored-by: Eric Maynard <eric.maynard+oss@snowflake.com>
Co-authored-by: Prashant Singh <35593236+singhpk234@users.noreply.github.com>
Co-authored-by: Yufei Gu <yufei@apache.org>
Co-authored-by: Dmitri Bourlatchkov <dmitri.bourlatchkov@gmail.com>
Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: Alexandre Dutra <adutra@users.noreply.github.com>
Co-authored-by: JB Onofré <jbonofre@apache.org>
Co-authored-by: Eric Maynard <emaynard@apache.org>
Co-authored-by: Yun Zou <yunzou.colostate@gmail.com>
Co-authored-by: Pooja Nilangekar <poojan@umd.edu>
Co-authored-by: Seungchul Lee <scleefe01@gmail.com>

Author: 12 people

.asf.yaml

@@ -54,7 +54,9 @@ github:
         # of the job's `name` property if it's present.
         contexts:
           - markdown-link-check
-          - build
+          - "Unit Tests"
+          - "Quarkus Tests"
+          - "Integration Tests"
           - regtest
           - spark-plugin-regtest
           - site

.github/CODEOWNERS

@@ -30,7 +30,10 @@
 
   // Added for posterity how to let Renovate manage version-branches, assuming that release branches
   // have the `release/` prefix.
-  baseBranches: ["main"],
+  baseBranches: [
+    "main",
+    "/^release\\/1[.].*",
+  ],
   additionalBranchPrefix: "{{baseBranch}}/",
   commitMessagePrefix: "{{baseBranch}}: ",
 

.github/renovate.json5

@@ -43,5 +43,5 @@ jobs:
       with:
         use-quiet-mode: 'yes'
         config-file: '.github/workflows/check-md-link-config.json'
-        folder-path: 'regtests, .github, build-logic, polaris-core, service, quarkus, persistence, spec, k8, getting-started, helm'
+        folder-path: 'regtests, .github, build-logic, polaris-core, service, runtime, persistence, spec, k8, getting-started, helm'
         file-path: 'CHAT_BYLAWS.md, CODE_OF_CONDUCT.md, CONTRIBUTING.md, README.md, SECURITY.md'

.github/workflows/check-md-link.yml

@@ -33,65 +33,89 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build:
 
+  unit-tests:
+    name: Unit Tests
     runs-on: ubuntu-latest
     permissions:
       contents: read
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Set up JDK 21
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           java-version: '21'
           distribution: 'temurin'
-
-      # Configure Gradle for optimal use in GiHub Actions, including caching of downloaded dependencies.
-      # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4
         with:
-          # The setup-gradle action fails, if the wrapper is not using the right version or is not present.
-          # Our `gradlew` validates the integrity of the `gradle-wrapper.jar`, so it's safe to disable this.
           validate-wrappers: false
-
-      - name: Code style checks and tests
-        run: ./gradlew --continue check
-
-      - name: Check Maven publication
-        run: ./gradlew publishToMavenLocal sourceTarball
-
+      - name: Run unit tests
+        run: |
+          ./gradlew check sourceTarball distTar distZip publishToMavenLocal \
+            -x :polaris-runtime-service:test \
+            -x :polaris-admin:test \
+            -x intTest --continue
       - name: Archive test results
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         if: always()
         with:
-          name: upload-test-artifacts
+          name: upload-unit-test-artifacts
           path: |
             **/build/test-results/**
 
-      - name: Stop Gradle daemons
-        run: ./gradlew --stop
-
-      # Ensure that the build works properly when building against the "latest greatest" Java version
-      - name: Set up JDK 23
+  quarkus-tests:
+    name: Quarkus Tests
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - name: Set up JDK 21
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
-          java-version: '23'
+          java-version: '21'
           distribution: 'temurin'
-      - name: Show Java version
-        run: java -version
-      - name: Clean
-        run: ./gradlew clean
-      - name: Build
-        run: ./gradlew compileAll
-      - name: Run selected tests
-        run: ./gradlew :polaris-quarkus-service:intTest
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4
+        with:
+          validate-wrappers: false
+      - name: Run Quarkus tests
+        run: |
+          ./gradlew \
+            :polaris-runtime-service:test \
+            :polaris-admin:test \
+            --continue
+      - name: Archive test results
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        if: always()
+        with:
+          name: upload-quarkus-test-artifacts
+          path: |
+            **/build/test-results/**
 
+  integration-tests:
+    name: Integration Tests
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4
+        with:
+          validate-wrappers: false
+      - name: Run integration tests
+        run: ./gradlew intTest --continue
       - name: Archive test results
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         if: always()
         with:
-          name: upload-test-artifacts-java-23
+          name: upload-integration-test-artifacts
           path: |
             **/build/test-results/**

.github/workflows/gradle.yml

@@ -86,12 +86,11 @@ jobs:
         run: |
           eval $(minikube -p minikube docker-env)
           ./gradlew \
-            :polaris-quarkus-server:assemble \
-            :polaris-quarkus-server:quarkusAppPartsBuild --rerun \
-            :polaris-quarkus-admin:assemble \
-            :polaris-quarkus-admin:quarkusAppPartsBuild --rerun \
-            -Dquarkus.container-image.build=true \
-            -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4
+            :polaris-server:assemble \
+            :polaris-server:quarkusAppPartsBuild --rerun \
+            :polaris-admin:assemble \
+            :polaris-admin:quarkusAppPartsBuild --rerun \
+            -Dquarkus.container-image.build=true
           minikube image ls
 
       - name: Install fixtures

.github/workflows/helm.yml

@@ -81,8 +81,8 @@ jobs:
       - name: Image build
         run: |
           ./gradlew \
-              :polaris-quarkus-server:assemble \
-              :polaris-quarkus-server:quarkusAppPartsBuild --rerun \
+              :polaris-server:assemble \
+              :polaris-server:quarkusAppPartsBuild --rerun \
               -Dquarkus.container-image.build=true
 
       - name: Integration Tests

.github/workflows/python-client.yml

@@ -49,8 +49,8 @@ jobs:
       - name: Image build
         run: |
           ./gradlew \
-              :polaris-quarkus-server:assemble \
-              :polaris-quarkus-server:quarkusAppPartsBuild --rerun \
+              :polaris-server:assemble \
+              :polaris-server:quarkusAppPartsBuild --rerun \
               -Dquarkus.container-image.build=true
 
       - name: Regression Test

.github/workflows/regtest.yml

@@ -52,8 +52,8 @@ jobs:
       - name: Image build
         run: |
           ./gradlew \
-              :polaris-quarkus-server:assemble \
-              :polaris-quarkus-server:quarkusAppPartsBuild --rerun \
+              :polaris-server:assemble \
+              :polaris-server:quarkusAppPartsBuild --rerun \
               -Dquarkus.container-image.build=true
 
       # NOTE: the regression test runs with spark 3.5.5 and scala 2.12 in Java 17. We also have integration

.github/workflows/spark_client_regtests.yml

@@ -28,8 +28,11 @@ client/python/poetry.lock
 /poetry.lock
 /polaris-venv/
 /pyproject.toml
-/client/python/
-!/client/python/pyproject.toml
+client/python/.openapi-generator/
+client/python/docs/
+client/python/polaris/
+client/python/test/
+!client/python/test/test_cli_parsing.py
 
 # Polaris CLI profile
 .polaris.json