Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/check-md-link.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,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'
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Build
run: ./gradlew compileAll
- name: Run selected tests
run: ./gradlew :polaris-quarkus-service:intTest
run: ./gradlew :polaris-runtime-service:intTest

- name: Archive test results
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ 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 \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
:polaris-admin:assemble \
:polaris-admin:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
minikube image ls

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spark_client_regtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ This product includes code from Project Nessie.
* build-logic/src/main/kotlin/publishing/PublishingHelperPlugin.kt
* build-logic/src/main/kotlin/Utilities.kt
* build-logic/src/main/kotlin/polaris-shadow-jar.gradle.kts
* build-logic/src/main/kotlin/polaris-quarkus.gradle.kts
* build-logic/src/main/kotlin/polaris-runtime.gradle.kts
* tools/config-docs/annotations/src/main/java/org/apache/polaris/docs/ConfigDocs.java
* tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/DocGenDoclet.java
* tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/MarkdownFormatter.java
Expand Down Expand Up @@ -309,7 +309,7 @@ This product includes code from Project Nessie.
* tools/config-docs/generator/src/test/java/tests/smallrye/SomeEnum.java
* tools/config-docs/generator/src/test/java/tests/smallrye/VeryNested.java
* tools/container-spec-helper/src/main/java/org/apache/polaris/containerspec/ContainerSpecHelper.java
* quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
* runtime/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
* helm/polaris/tests/logging_storage_test.yaml
* helm/polaris/tests/quantity_test.yaml
* helm/polaris/tests/service_monitor_test.yaml
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ Apache Polaris is organized into the following modules:
- `polaris-api-iceberg-service` - The Iceberg REST service
- Service modules:
- `polaris-service-common` - The main components of the Polaris server
- Quarkus runtime modules:
- `polaris-quarkus-service` - The Quarkus-specific components of the Polaris server
- `polaris-quarkus-defaults` - The Quarkus-specific configuration defaults
- `polaris-quarkus-server` - The Polaris server runtime
- `polaris-quarkus-admin-tool` - The Polaris admin & maintenance tool
- Runtime modules:
- `polaris-runtime-service` - The runtime components of the Polaris server
- `polaris-runtime-defaults` - The runtime configuration defaults
- `polaris-server` - The Polaris server
- `polaris-admin` - The Polaris admin & maintenance tool
- Persistence modules:
- `polaris-eclipselink` - The Eclipselink implementation of the MetaStoreManager interface
- `polaris-relational-jdbc` - The JDBC implementation of BasePersistence to be used via AtomicMetaStoreManager
Expand Down Expand Up @@ -88,8 +88,8 @@ select * from db1.table1;
- To build the image locally:
```bash
./gradlew \
:polaris-quarkus-server:assemble \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
```
- `docker run -p 8181:8181 -p 8182:8182 apache/polaris:latest` - To run the image.
Expand All @@ -116,7 +116,7 @@ Polaris Servers can be configured using a variety of ways.
Please see the [Configuration Guide](site/content/in-dev/unreleased/configuration.md)
for more information.

Default configuration values can be found in `quarkus/defaults/src/main/resources/application.properties`.
Default configuration values can be found in `runtime/defaults/src/main/resources/application.properties`.

#### Building docs

Expand Down
2 changes: 1 addition & 1 deletion aggregated-license-report/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import org.gradle.kotlin.dsl.support.unzipTo
val licenseReports by configurations.creating { description = "Used to generate license reports" }

dependencies {
licenseReports(project(":polaris-quarkus-service", "licenseReports"))
licenseReports(project(":polaris-runtime-service", "licenseReports"))
}

val collectLicenseReportJars by
Expand Down
14 changes: 7 additions & 7 deletions bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ dependencies {
api(project(":polaris-eclipselink"))
api(project(":polaris-relational-jdbc"))

api(project(":polaris-quarkus-admin"))
api(project(":polaris-quarkus-common"))
api(project(":polaris-quarkus-test-commons"))
api(project(":polaris-quarkus-defaults"))
api(project(":polaris-quarkus-server"))
api(project(":polaris-quarkus-service"))
api(project(":polaris-quarkus-spark-tests"))
api(project(":polaris-admin"))
api(project(":polaris-runtime-common"))
api(project(":polaris-runtime-test-common"))
api(project(":polaris-runtime-defaults"))
api(project(":polaris-server"))
api(project(":polaris-runtime-service"))
api(project(":polaris-runtime-spark-tests"))

api(project(":polaris-tests"))
}
Expand Down
2 changes: 1 addition & 1 deletion getting-started/assets/cloud_providers/deploy-aws.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ aws s3api create-bucket --bucket $S3_BUCKET_NAME --region $CURRENT_REGION --crea

export STORAGE_LOCATION="s3://$S3_BUCKET_NAME/quickstart_catalog/"

./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \
./gradlew clean :polaris-server:assemble :polaris-admin:assemble \
-Dquarkus.container-image.tag=postgres-latest \
-Dquarkus.container-image.build=true \
--no-build-cache
Expand Down
2 changes: 1 addition & 1 deletion getting-started/assets/cloud_providers/deploy-azure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fs.native-azure.enabled=true
azure.auth-type=DEFAULT
EOF

./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \
./gradlew clean :polaris-server:assemble :polaris-admin:assemble \
-Dquarkus.container-image.tag=postgres-latest \
-Dquarkus.container-image.build=true \
--no-build-cache
Expand Down
2 changes: 1 addition & 1 deletion getting-started/assets/cloud_providers/deploy-gcp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ echo "GCS Bucket Name: $GCS_BUCKET_NAME"
gcloud storage buckets create "gs://$GCS_BUCKET_NAME" --location=$CURRENT_REGION
export STORAGE_LOCATION="gs://$GCS_BUCKET_NAME/quickstart_catalog/"

./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \
./gradlew clean :polaris-server:assemble :polaris-admin:assemble \
-Dquarkus.container-image.tag=postgres-latest \
-Dquarkus.container-image.build=true \
--no-build-cache
Expand Down
8 changes: 4 additions & 4 deletions getting-started/eclipselink/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ This example requires `jq` to be installed on your machine.

```shell
./gradlew \
:polaris-quarkus-server:assemble \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-quarkus-admin:assemble \
:polaris-quarkus-admin:quarkusAppPartsBuild --rerun \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
:polaris-admin:assemble \
:polaris-admin:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.tag=postgres-latest \
-Dquarkus.container-image.build=true
```
Expand Down
8 changes: 4 additions & 4 deletions getting-started/jdbc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ This example requires `jq` to be installed on your machine.

```shell
./gradlew \
:polaris-quarkus-server:assemble \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-quarkus-admin:assemble \
:polaris-quarkus-admin:quarkusAppPartsBuild --rerun \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
:polaris-admin:assemble \
:polaris-admin:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.tag=postgres-latest \
-Dquarkus.container-image.build=true
```
Expand Down
4 changes: 2 additions & 2 deletions getting-started/spark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ If a Polaris image is not already present locally, build one with the following

```shell
./gradlew \
:polaris-quarkus-server:assemble \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
```

Expand Down
4 changes: 2 additions & 2 deletions getting-started/telemetry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ This example requires `jq` to be installed on your machine.

```shell
./gradlew \
:polaris-quarkus-server:assemble \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
```

Expand Down
16 changes: 8 additions & 8 deletions gradle/projects.main.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ polaris-api-management-model=api/management-model
polaris-api-management-service=api/management-service
polaris-api-catalog-service=api/polaris-catalog-service
polaris-service-common=service/common
polaris-quarkus-defaults=quarkus/defaults
polaris-quarkus-service=quarkus/service
polaris-quarkus-server=quarkus/server
polaris-quarkus-distribution=quarkus/distribution
polaris-quarkus-spark-tests=quarkus/spark-tests
polaris-quarkus-admin=quarkus/admin
polaris-quarkus-common=quarkus/common
polaris-quarkus-test-commons=quarkus/test-commons
polaris-runtime-defaults=runtime/defaults
polaris-runtime-service=runtime/service
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-commons
polaris-eclipselink=persistence/eclipselink
polaris-relational-jdbc=persistence/relational-jdbc
polaris-tests=integration-tests
Expand Down
10 changes: 5 additions & 5 deletions helm/polaris/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ If necessary, build and load the Docker images with support for Postgres into Mi
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 \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
:polaris-admin:assemble \
:polaris-admin:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
```

Expand Down Expand Up @@ -171,7 +171,7 @@ Run the catalog bootstrap using the Polaris admin tool. This step initializes th
```bash
java -Dpolaris.persistence.eclipselink.configuration-file=./persistence.xml \
-Dpolaris.persistence.eclipselink.persistence-unit=polaris \
-jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar \
-jar runtime/admin/build/polaris-admin-*-runner.jar \
bootstrap -c POLARIS,root,pass -r POLARIS
```

Expand Down
10 changes: 5 additions & 5 deletions helm/polaris/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ If necessary, build and load the Docker images with support for Postgres into Mi
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 \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
:polaris-admin:assemble \
:polaris-admin:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
```

Expand Down Expand Up @@ -172,7 +172,7 @@ Run the catalog bootstrap using the Polaris admin tool. This step initializes th
```bash
java -Dpolaris.persistence.eclipselink.configuration-file=./persistence.xml \
-Dpolaris.persistence.eclipselink.persistence-unit=polaris \
-jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar \
-jar runtime/admin/build/polaris-admin-*-runner.jar \
bootstrap -c POLARIS,root,pass -r POLARIS
```

Expand Down
4 changes: 2 additions & 2 deletions plugins/spark/v3.5/getting-started/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ If a Polaris image is not already present locally, build one with the following

```shell
./gradlew \
:polaris-quarkus-server:assemble \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
```

Expand Down
6 changes: 3 additions & 3 deletions plugins/spark/v3.5/integration/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
plugins {
alias(libs.plugins.quarkus)
alias(libs.plugins.jandex)
id("polaris-quarkus")
id("polaris-runtime")
}

// get version information
Expand All @@ -43,7 +43,7 @@ dependencies {
exclude(group = "org.scala-lang", module = "scala-reflect")
}

implementation(project(":polaris-quarkus-service"))
implementation(project(":polaris-runtime-service"))

testImplementation(project(":polaris-api-management-model"))
testImplementation(project(":polaris-spark-${sparkMajorVersion}_${scalaVersion}"))
Expand Down Expand Up @@ -72,7 +72,7 @@ dependencies {
"org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}"
)

testImplementation(testFixtures(project(":polaris-quarkus-service")))
testImplementation(testFixtures(project(":polaris-runtime-service")))

testImplementation(platform(libs.quarkus.bom))
testImplementation("io.quarkus:quarkus-junit5")
Expand Down
4 changes: 2 additions & 2 deletions plugins/spark/v3.5/regtests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ follows:
```shell
./gradlew build
./gradlew \
:polaris-quarkus-server:assemble \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
docker compose -f ./plugins/spark/v3.5/regtests/docker-compose.yml up --build --exit-code-from regtest
```
Expand Down
4 changes: 2 additions & 2 deletions regtests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ follows:

```shell
./gradlew \
:polaris-quarkus-server:assemble \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-server:assemble \
:polaris-server:quarkusAppPartsBuild --rerun \
-Dquarkus.container-image.build=true
docker compose -f ./regtests/docker-compose.yml up --build --exit-code-from regtest
```
Expand Down
4 changes: 2 additions & 2 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ sh ./kind-registry.sh
# Build and deploy the server image
echo "Building polaris image..."
./gradlew \
:polaris-quarkus-server:build \
:polaris-quarkus-server:quarkusAppPartsBuild --rerun \
:polaris-server:build \
:polaris-server:quarkusAppPartsBuild --rerun \
$ECLIPSE_LINK_DEPS \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.registry=localhost:5001
Expand Down
Loading
Loading