You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2026/06/23 03:49:16 UTC

(spark) branch master updated: [SPARK-57501][SQL][TEST] Update stale JDK 21 golden file for nonansi/try_arithmetic.sql

This is an automated email from the ASF dual-hosted git repository.

HyukjinKwon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 6bf83058caf6 [SPARK-57501][SQL][TEST] Update stale JDK 21 golden file for nonansi/try_arithmetic.sql
6bf83058caf6 is described below

commit 6bf83058caf63768e92a8e4bf3cf17a64babf4b8
Author: Hyukjin Kwon <gu...@apache.org>
AuthorDate: Tue Jun 23 12:49:03 2026 +0900

    [SPARK-57501][SQL][TEST] Update stale JDK 21 golden file for nonansi/try_arithmetic.sql
    
    ### What changes were proposed in this pull request?
    
    Update the stale JDK 21+ golden file
    `sql/core/src/test/resources/sql-tests/results/nonansi/try_arithmetic.sql.out.java21`.
    
    ### Why are the changes needed?
    
    SPARK-57501 (commit dea9c30) changed the `DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE`
    message for `try_add(interval ...)` and regenerated the base `try_arithmetic.sql.out`,
    but missed the JDK 21-specific override `try_arithmetic.sql.out.java21`. `SQLQueryTestSuite`
    reads the `.out.java21` override when running on JDK >= 21, so the stale `requiredType`
    line makes `nonansi/try_arithmetic.sql` fail on every JDK 21+ scheduled build (Maven JDK 21/25,
    Java 21, Java 25). Example failing apache run:
    https://github.com/apache/spark/actions/runs/27907992223
    
    ### Does this PR introduce any user-facing change?
    
    No. Test golden file only.
    
    ### How was this patch tested?
    
    **Validated GREEN on the fork:** the Maven (Scala 2.13, JDK 21) build's SQL lane passes with this
    golden update — https://github.com/HyukjinKwon/spark/actions/runs/27935083986
    
    Note: that validation run bundles this golden fix together with the separate `PythonUDFWorker`
    AF_UNIX fix (#56646) and the log4j 2.26.0 JDK 25 fix, because the full Maven JDK 21 build exercises
    all of them in the same jobs. Each is its own PR; this PR's diff is only the `.out.java21` golden.
    
    The second commit is a clearly-marked `[DO NOT MERGE]` CI trigger edit for fork validation and should
    be dropped before merge.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    Yes. Generated with Claude Code (Anthropic) under the direction of the repository owner.
    
    Closes #56657 from HyukjinKwon/ci-fix/try-arith.
    
    Authored-by: Hyukjin Kwon <gu...@apache.org>
    Signed-off-by: Hyukjin Kwon <hy...@databricks.com>
---
 .../resources/sql-tests/results/nonansi/try_arithmetic.sql.out.java21   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/core/src/test/resources/sql-tests/results/nonansi/try_arithmetic.sql.out.java21 b/sql/core/src/test/resources/sql-tests/results/nonansi/try_arithmetic.sql.out.java21
index b3f78b5a4a8a..fe16b02c55d4 100644
--- a/sql/core/src/test/resources/sql-tests/results/nonansi/try_arithmetic.sql.out.java21
+++ b/sql/core/src/test/resources/sql-tests/results/nonansi/try_arithmetic.sql.out.java21
@@ -196,7 +196,7 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
     "inputSql" : "\"INTERVAL '2' YEAR\"",
     "inputType" : "\"INTERVAL YEAR\"",
     "paramIndex" : "first",
-    "requiredType" : "\"(TIMESTAMP OR TIMESTAMP WITHOUT TIME ZONE)\"",
+    "requiredType" : "(\"(TIMESTAMP OR TIMESTAMP WITHOUT TIME ZONE)\" or \"(TIMESTAMP_LTZ(P) OR TIMESTAMP_NTZ(P) WITH P IN [7, 9])\")",
     "sqlExpr" : "\"INTERVAL '2' YEAR + INTERVAL '02' SECOND\""
   },
   "queryContext" : [ {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org