Merge branch 'apache:main' into main

Author: martin-augment

.github/workflows/codeql.yml

@@ -45,11 +45,11 @@ jobs:
         persist-credentials: false
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@c793b717bc78562f491db7b0e93a3a178b099162 # v4
+      uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4
       with:
         languages: actions
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4
+      uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4
       with:
         category: "/language:actions"

.github/workflows/docker-publish.yml

@@ -62,15 +62,15 @@ jobs:
       - name: Echo Comet version
         run: echo "The current Comet version is ${{ env.COMET_VERSION }}"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           platforms: linux/amd64,linux/arm64
           push: true

.github/workflows/iceberg_spark_test.yml

@@ -48,6 +48,7 @@ on:
 
 env:
   RUST_VERSION: stable
+  RUST_BACKTRACE: 1
 
 jobs:
   # Build native library once and share with all test jobs

.github/workflows/pr_benchmark_check.yml

@@ -41,6 +41,7 @@ on:
 
 env:
   RUST_VERSION: stable
+  RUST_BACKTRACE: 1
 
 jobs:
   benchmark-check:

.github/workflows/pr_build_linux.yml

@@ -48,6 +48,7 @@ on:
 
 env:
   RUST_VERSION: stable
+  RUST_BACKTRACE: 1
 
 jobs:
 

.github/workflows/pr_build_macos.yml

@@ -48,6 +48,7 @@ on:
 
 env:
   RUST_VERSION: stable
+  RUST_BACKTRACE: 1
 
 jobs:
 

.github/workflows/spark_sql_test.yml

@@ -54,6 +54,7 @@ on:
 
 env:
   RUST_VERSION: stable
+  RUST_BACKTRACE: 1
 
 jobs:
 

.github/workflows/spark_sql_test_native_datafusion.yml

@@ -28,6 +28,7 @@ on:
 
 env:
   RUST_VERSION: stable
+  RUST_BACKTRACE: 1
 
 jobs:
   spark-sql-catalyst-native-datafusion:

.github/workflows/spark_sql_test_native_iceberg_compat.yml

@@ -28,6 +28,7 @@ on:
 
 env:
   RUST_VERSION: stable
+  RUST_BACKTRACE: 1
 
 jobs:
   spark-sql-catalyst-native-iceberg-compat:

common/src/main/java/org/apache/comet/exceptions/CometQueryExecutionException.java

@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.comet.exceptions;
+
+import org.apache.comet.CometNativeException;
+
+/**
+ * Exception thrown from Comet native execution containing JSON-encoded error information. The
+ * message contains a JSON object with the following structure:
+ *
+ * <pre>
+ * {
+ *   "errorType": "DivideByZero",
+ *   "errorClass": "DIVIDE_BY_ZERO",
+ *   "params": { ... },
+ *   "context": { "sqlText": "...", "startOffset": 0, "stopOffset": 10 },
+ *   "hint": "Use `try_divide` to tolerate divisor being 0"
+ * }
+ * </pre>
+ *
+ * CometExecIterator parses this JSON and converts it to the appropriate Spark exception by calling
+ * the corresponding QueryExecutionErrors.* method.
+ */
+public final class CometQueryExecutionException extends CometNativeException {
+
+  /**
+   * Creates a new CometQueryExecutionException with a JSON-encoded error message.
+   *
+   * @param jsonMessage JSON string containing error information
+   */
+  public CometQueryExecutionException(String jsonMessage) {
+    super(jsonMessage);
+  }
+
+  /**
+   * Returns true if the message appears to be JSON-formatted. This is used to distinguish between
+   * JSON-encoded errors and legacy error messages.
+   *
+   * @return true if message starts with '{' and ends with '}'
+   */
+  public boolean isJsonMessage() {
+    String msg = getMessage();
+    if (msg == null) return false;
+    String trimmed = msg.trim();
+    return trimmed.startsWith("{") && trimmed.endsWith("}");
+  }
+}