From 48f8c35f1a0123067ed9a56b6f59c550db9c069a Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Wed, 30 Apr 2025 15:18:41 +0800 Subject: [PATCH 1/2] init --- .../org/apache/spark/unsafe/types/CollationFactorySuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/unsafe/src/test/scala/org/apache/spark/unsafe/types/CollationFactorySuite.scala b/common/unsafe/src/test/scala/org/apache/spark/unsafe/types/CollationFactorySuite.scala index b20baa6050f42..8e9d33efe7a6d 100644 --- a/common/unsafe/src/test/scala/org/apache/spark/unsafe/types/CollationFactorySuite.scala +++ b/common/unsafe/src/test/scala/org/apache/spark/unsafe/types/CollationFactorySuite.scala @@ -27,13 +27,14 @@ import org.apache.spark.sql.catalyst.util.CollationFactory.fetchCollation // scalastyle:off import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.must.Matchers +import com.ibm.icu.util.VersionInfo.ICU_VERSION import org.apache.spark.sql.catalyst.util.CollationFactory._ import org.apache.spark.unsafe.types.UTF8String.{fromString => toUTF8} class CollationFactorySuite extends AnyFunSuite with Matchers { // scalastyle:ignore funsuite - val currentIcuVersion: String = "76.1" + val currentIcuVersion: String = s"${ICU_VERSION.getMajor}.${ICU_VERSION.getMinor}" test("collationId stability") { assert(INDETERMINATE_COLLATION_ID == -1) From 8ce1d7662509cd9c1c35b4fd388e2bb0eda96e05 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Wed, 30 Apr 2025 15:43:24 +0800 Subject: [PATCH 2/2] init --- .../scala/org/apache/spark/sql/collation/CollationSuite.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/collation/CollationSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/collation/CollationSuite.scala index 11e9547dfc5ea..c278233b557b7 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/collation/CollationSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/collation/CollationSuite.scala @@ -19,6 +19,8 @@ package org.apache.spark.sql.collation import scala.jdk.CollectionConverters.MapHasAsJava +import com.ibm.icu.util.VersionInfo.ICU_VERSION + import org.apache.spark.SparkException import org.apache.spark.sql.{AnalysisException, Row} import org.apache.spark.sql.catalyst.ExtendedAnalysisException @@ -1919,7 +1921,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper { // verify that the output ordering is as expected (UTF8_BINARY, UTF8_LCASE, etc.) val df = sql("SELECT * FROM collations() limit 10") - val icvVersion = "76.1.0.0" + val icvVersion = ICU_VERSION.toString checkAnswer(df, Seq(Row("SYSTEM", "BUILTIN", "UTF8_BINARY", null, null, "ACCENT_SENSITIVE", "CASE_SENSITIVE", "NO_PAD", null),