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 eb5b27a45 [GLUTEN-5341] Fix part of Spark 3.5 UTs (#5445)
eb5b27a45 is described below
commit eb5b27a45a7273dc5d46a4c60b2fa27f579c0520
Author: Yan Ma <[email protected]>
AuthorDate: Fri Apr 19 12:03:59 2024 +0800
[GLUTEN-5341] Fix part of Spark 3.5 UTs (#5445)
enable VeloxCacheSuite, VeloxHashJoinSuite
---
.../scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala | 3 +--
.../test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala | 5 +++--
.../test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala
index 33f0f7dfb..a25f1b9c5 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala
@@ -76,8 +76,7 @@ class VeloxColumnarCacheSuite extends
VeloxWholeStageTransformerSuite with Adapt
}
}
- // Disable for Sparke3.5.
- testWithSpecifiedSparkVersion("input row", Some("3.2"), Some("3.4")) {
+ testWithSpecifiedSparkVersion("input row", Some("3.2")) {
withTable("t") {
sql("CREATE TABLE t USING json AS SELECT * FROM values(1, 'a', (2, 'b'),
(3, 'c'))")
runQueryAndCompare("SELECT * FROM t", cache = true) {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala
index b0eba7aa2..9239f90e1 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala
@@ -67,8 +67,7 @@ class VeloxHashJoinSuite extends
VeloxWholeStageTransformerSuite {
}
}
- // Disable for Spark3.5.
- testWithSpecifiedSparkVersion("generate hash join plan - v2", Some("3.2"),
Some("3.4")) {
+ testWithSpecifiedSparkVersion("generate hash join plan - v2", Some("3.2")) {
withSQLConf(
("spark.sql.autoBroadcastJoinThreshold", "-1"),
("spark.sql.adaptive.enabled", "false"),
@@ -88,6 +87,8 @@ class VeloxHashJoinSuite extends
VeloxWholeStageTransformerSuite {
val wholeStages = plan.collect { case wst: WholeStageTransformer => wst }
if (SparkShimLoader.getSparkVersion.startsWith("3.2.")) {
assert(wholeStages.length == 1)
+ } else if (SparkShimLoader.getSparkVersion.startsWith("3.5.")) {
+ assert(wholeStages.length == 5)
} else {
assert(wholeStages.length == 3)
}
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 6f6c6d05a..a16590422 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -943,7 +943,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenCTEInlineSuiteAEOff]
enableSuite[GlutenCTEInlineSuiteAEOn]
enableSuite[GlutenDataFrameAggregateSuite]
- // Disable for Spark3.5.
+ // Test for vanilla spark codegen, not apply for Gluten
.exclude("SPARK-43876: Enable fast hashmap for distinct queries")
.exclude(
"zero moments", // [velox does not return NaN]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
