Merge upstream/main into feature/aes-encrypt-support

Author: Shekharrajak

.github/actions/java-test/action.yaml

@@ -37,11 +37,16 @@ inputs:
     description: 'Whether to upload test results including coverage to GitHub'
     required: false
     default: 'false'
+  skip-native-build:
+    description: 'Skip native build (when using pre-built artifact)'
+    required: false
+    default: 'false'
 
 runs:
   using: "composite"
   steps:
     - name: Run Cargo release build
+      if: ${{ inputs.skip-native-build != 'true' }}
       shell: bash
       # it is important that we run the Scala tests against a release build rather than a debug build
       # to make sure that no tests are relying on overflow checks that are present only in debug builds

.github/actions/rust-test/action.yaml

@@ -21,11 +21,7 @@ description: "Run Rust tests"
 runs:
   using: "composite"
   steps:
-    - name: Check Cargo fmt
-      shell: bash
-      run: |
-        cd native
-        cargo fmt --all -- --check --color=never
+    # Note: cargo fmt check is now handled by the lint job that gates this workflow
 
     - name: Check Cargo clippy
       shell: bash

.github/actions/setup-spark-builder/action.yaml

@@ -24,6 +24,10 @@ inputs:
   spark-version:
     description: 'The Apache Spark version (e.g., 3.5.7) to build'
     required: true
+  skip-native-build:
+    description: 'Skip native build (when using pre-built artifact)'
+    required: false
+    default: 'false'
 runs:
   using: "composite"
   steps:
@@ -51,7 +55,15 @@ runs:
         restore-keys: |
           ${{ runner.os }}-spark-sql-
 
-    - name: Build Comet
+    - name: Build Comet (with native)
+      if: ${{ inputs.skip-native-build != 'true' }}
       shell: bash
       run: |
         PROFILES="-Pspark-${{inputs.spark-short-version}}" make release
+
+    - name: Build Comet (Maven only, skip native)
+      if: ${{ inputs.skip-native-build == 'true' }}
+      shell: bash
+      run: |
+        # Native library should already be in native/target/release/
+        ./mvnw install -Prelease -DskipTests -Pspark-${{inputs.spark-short-version}}

.github/workflows/benchmark-tpcds.yml

@@ -46,6 +46,13 @@ jobs:
         with:
           python-version: "3.10"
 
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
+
       - name: Install dependencies
         run: |
           set -x