This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 19eaa4dc6a [GLUTEN-11088][VL] Fix try_cast in
ScalarFunctionsValidateSuite for Spark 4.0 (#11180)
19eaa4dc6a is described below
commit 19eaa4dc6a0c89f23e259b2d7ac323215fbde17b
Author: Rong Ma <[email protected]>
AuthorDate: Wed Nov 26 09:15:03 2025 +0000
[GLUTEN-11088][VL] Fix try_cast in ScalarFunctionsValidateSuite for Spark
4.0 (#11180)
* try_cast mode
* enable some cases in GlutenTryCastSuite
* fix
---
.../org/apache/gluten/functions/ScalarFunctionsValidateSuite.scala | 3 +--
.../test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 2 --
.../main/scala/org/apache/gluten/sql/shims/spark40/Spark40Shims.scala | 2 ++
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/functions/ScalarFunctionsValidateSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/functions/ScalarFunctionsValidateSuite.scala
index 222c02b833..febd7da4f6 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/functions/ScalarFunctionsValidateSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/functions/ScalarFunctionsValidateSuite.scala
@@ -1098,8 +1098,7 @@ abstract class ScalarFunctionsValidateSuite extends
FunctionsValidateSuite {
}
}
- // TODO: fix on spark-4.0
- testWithRangeSparkVersion("try_cast", "3.4", "3.5") {
+ testWithMinSparkVersion("try_cast", "3.4") {
withTempView("try_cast_table") {
withTempPath {
path =>
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index c1ffb63301..9e6b8050bd 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -120,8 +120,6 @@ class VeloxTestSettings extends BackendTestSettings {
// Revised by setting timezone through config and commented unsupported
cases.
.exclude("cast string to timestamp")
// TODO: fix in Spark-4.0
- .exclude("cast from array III")
- .exclude("cast from struct III")
.exclude("Casting to char/varchar")
enableSuite[GlutenCollectionExpressionsSuite]
// Rewrite in Gluten to replace Seq with Array
diff --git
a/shims/spark40/src/main/scala/org/apache/gluten/sql/shims/spark40/Spark40Shims.scala
b/shims/spark40/src/main/scala/org/apache/gluten/sql/shims/spark40/Spark40Shims.scala
index 70ff762e82..9445eaf9cc 100644
---
a/shims/spark40/src/main/scala/org/apache/gluten/sql/shims/spark40/Spark40Shims.scala
+++
b/shims/spark40/src/main/scala/org/apache/gluten/sql/shims/spark40/Spark40Shims.scala
@@ -600,6 +600,7 @@ class Spark40Shims extends SparkShims {
case s: Subtract => s.evalMode == EvalMode.TRY
case d: Divide => d.evalMode == EvalMode.TRY
case m: Multiply => m.evalMode == EvalMode.TRY
+ case c: Cast => c.evalMode == EvalMode.TRY
case _ => false
}
}
@@ -610,6 +611,7 @@ class Spark40Shims extends SparkShims {
case s: Subtract => s.evalMode == EvalMode.ANSI
case d: Divide => d.evalMode == EvalMode.ANSI
case m: Multiply => m.evalMode == EvalMode.ANSI
+ case c: Cast => c.evalMode == EvalMode.ANSI
case _ => false
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
