From 9b1f63dfc8b750ee38bb26cbaa5295f2a6990382 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Fri, 17 Oct 2025 11:38:04 +0800 Subject: [PATCH 1/2] [SPARK-53940][SQL] Function version() should return full spark version instead of short version --- .../spark/sql/catalyst/expressions/ExpressionImplUtils.java | 2 +- .../test/scala/org/apache/spark/sql/MiscFunctionsSuite.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java index a5228edc33c8..db959627df58 100644 --- a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java +++ b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java @@ -183,7 +183,7 @@ public static byte[] aesDecrypt(byte[] input, * Space separated version and revision. */ public static UTF8String getSparkVersion() { - String shortVersion = VersionUtils.shortVersion(SparkBuildInfo.spark_version()); + String shortVersion = SparkBuildInfo.spark_version(); String revision = SparkBuildInfo.spark_revision(); return UTF8String.fromString(shortVersion + " " + revision); } diff --git a/sql/core/src/test/scala/org/apache/spark/sql/MiscFunctionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/MiscFunctionsSuite.scala index b95b7b9d4c00..029e3bc00fb2 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/MiscFunctionsSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/MiscFunctionsSuite.scala @@ -17,7 +17,7 @@ package org.apache.spark.sql -import org.apache.spark.{SPARK_REVISION, SPARK_VERSION_SHORT} +import org.apache.spark.{SPARK_REVISION, SPARK_VERSION} import org.apache.spark.sql.catalyst.expressions.Hex import org.apache.spark.sql.catalyst.parser.ParseException import org.apache.spark.sql.functions._ @@ -42,7 +42,7 @@ class MiscFunctionsSuite extends QueryTest with SharedSparkSession { val df = sql("SELECT version()") checkAnswer( df, - Row(SPARK_VERSION_SHORT + " " + SPARK_REVISION)) + Row(SPARK_VERSION + " " + SPARK_REVISION)) assert(df.schema.fieldNames === Seq("version()")) checkAnswer(df.selectExpr("version()"), df.select(version())) From dc8ecd8ab7eedc551e66afa07c3b2e170d1409d0 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Fri, 17 Oct 2025 12:55:34 +0800 Subject: [PATCH 2/2] remove unused import --- .../spark/sql/catalyst/expressions/ExpressionImplUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java index db959627df58..e22a86eb22de 100644 --- a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java +++ b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java @@ -35,7 +35,6 @@ import org.apache.spark.sql.catalyst.util.GenericArrayData; import org.apache.spark.sql.errors.QueryExecutionErrors; import org.apache.spark.unsafe.types.UTF8String; -import org.apache.spark.util.VersionUtils; import org.apache.spark.util.random.XORShiftRandom; /**