This is an automated email from the ASF dual-hosted git repository.
jackylee-ch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gluten.git
The following commit(s) were added to refs/heads/main by this push:
new ecc045cd08 [MINOR][TEST] Drop 'min Spark 3.2' guards in test suites
(#12574)
ecc045cd08 is described below
commit ecc045cd08bf25a2f5df8af3659f2aae1a85fe13
Author: YangJie <[email protected]>
AuthorDate: Mon Jul 27 20:21:02 2026 +0800
[MINOR][TEST] Drop 'min Spark 3.2' guards in test suites (#12574)
---
.../gluten/execution/VeloxColumnarCacheSuite.scala | 2 +-
.../org/apache/gluten/execution/DeltaSuite.scala | 37 +++++++---------------
.../org/apache/gluten/execution/HudiSuite.scala | 6 ++--
.../expressions/GlutenExpressionMappingSuite.scala | 4 +--
4 files changed, 18 insertions(+), 31 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 62f2c1d157..64b0196375 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
@@ -87,7 +87,7 @@ class VeloxColumnarCacheSuite extends
VeloxWholeStageTransformerSuite with Adapt
}
}
- testWithMinSparkVersion("input row", "3.2") {
+ test("input row") {
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/gluten-delta/src/test/scala/org/apache/gluten/execution/DeltaSuite.scala
b/gluten-delta/src/test/scala/org/apache/gluten/execution/DeltaSuite.scala
index 9f8e994f8d..b2f4122039 100644
--- a/gluten-delta/src/test/scala/org/apache/gluten/execution/DeltaSuite.scala
+++ b/gluten-delta/src/test/scala/org/apache/gluten/execution/DeltaSuite.scala
@@ -66,8 +66,7 @@ abstract class DeltaSuite extends WholeStageTransformerSuite {
}
}
- // NameMapping is supported in Delta 2.0 (related to Spark3.2.0)
- testWithMinSparkVersion("column mapping mode = name", "3.2") {
+ test("column mapping mode = name") {
withTable("delta_cm2") {
spark.sql(s"""
|create table delta_cm2 (id int, name string) using delta
@@ -110,9 +109,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
// broke `PreparedDeltaFileIndex.matchingFiles` and silently returned all
files.
Seq("name", "id").foreach {
mode =>
- testWithMinSparkVersion(
- s"column mapping mode = $mode with partition filter (single partition
col)",
- "3.2") {
+ test(s"column mapping mode = $mode with partition filter (single
partition col)") {
withTable("delta_cm_part") {
spark.sql(s"""
|create table delta_cm_part (id int, name string) using
delta
@@ -153,9 +150,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion(
- s"column mapping mode = $mode with partition filter (multi partition
col)",
- "3.2") {
+ test(s"column mapping mode = $mode with partition filter (multi
partition col)") {
withTable("delta_cm_part_multi") {
spark.sql(s"""
|create table delta_cm_part_multi
@@ -185,9 +180,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion(
- s"column mapping mode = $mode with partition + data filter",
- "3.2") {
+ test(s"column mapping mode = $mode with partition + data filter") {
withTable("delta_cm_part_data") {
spark.sql(s"""
|create table delta_cm_part_data (id int, name string,
age int)
@@ -220,9 +213,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion(
- s"column mapping mode = $mode with IS [NOT] NULL on partition col",
- "3.2") {
+ test(s"column mapping mode = $mode with IS [NOT] NULL on partition col")
{
withTable("delta_cm_part_null") {
spark.sql(s"""
|create table delta_cm_part_null (id int, name string)
@@ -247,9 +238,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion(
- s"column mapping mode = $mode partition filter survives column rename",
- "3.2") {
+ test(s"column mapping mode = $mode partition filter survives column
rename") {
withTable("delta_cm_part_rename") {
spark.sql(s"""
|create table delta_cm_part_rename (id int, name string)
@@ -272,9 +261,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion(
- s"column mapping mode = $mode data column rename + filter (file
skipping)",
- "3.2") {
+ test(s"column mapping mode = $mode data column rename + filter (file
skipping)") {
withTable("delta_cm_data_rename") {
spark.sql(s"""
|create table delta_cm_data_rename (id int, age int,
name string)
@@ -324,7 +311,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion("delta: partition filters", "3.2") {
+ test("delta: partition filters") {
withTable("delta_pf") {
spark.sql(s"""
|create table delta_pf (id int, name string) using delta
partitioned by (name)
@@ -343,7 +330,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion("basic test with stats.skipping disabled", "3.2") {
+ test("basic test with stats.skipping disabled") {
withTable("delta_test2") {
withSQLConf("spark.databricks.delta.stats.skipping" -> "false") {
spark.sql(s"""
@@ -363,7 +350,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion("column mapping with complex type", "3.2") {
+ test("column mapping with complex type") {
withTable("t1") {
val simpleNestedSchema = new StructType()
.add("a", StringType, true)
@@ -440,7 +427,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion("delta: push down input_file_name expression",
"3.2") {
+ test("delta: push down input_file_name expression") {
withTable("source_table") {
withTable("target_table") {
spark.sql(s"""
@@ -478,7 +465,7 @@ abstract class DeltaSuite extends
WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion("delta: need to validate delta expression before
execution", "3.2") {
+ test("delta: need to validate delta expression before execution") {
withTable("source_table") {
withTable("target_table") {
spark.sql(s"""
diff --git
a/gluten-hudi/src/test/scala/org/apache/gluten/execution/HudiSuite.scala
b/gluten-hudi/src/test/scala/org/apache/gluten/execution/HudiSuite.scala
index 0e2a7796e6..aa87e5c59a 100644
--- a/gluten-hudi/src/test/scala/org/apache/gluten/execution/HudiSuite.scala
+++ b/gluten-hudi/src/test/scala/org/apache/gluten/execution/HudiSuite.scala
@@ -38,7 +38,7 @@ abstract class HudiSuite extends WholeStageTransformerSuite {
.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
}
- testWithMinSparkVersion("hudi: time travel", "3.2") {
+ test("hudi: time travel") {
withTable("hudi_tm") {
spark.sql(s"""
|create table hudi_tm (id int, name string) using hudi
@@ -65,7 +65,7 @@ abstract class HudiSuite extends WholeStageTransformerSuite {
}
}
- testWithMinSparkVersion("hudi: soft delete", "3.2") {
+ test("hudi: soft delete") {
withTable("hudi_pf") {
spark.sql(s"""
|create table hudi_pf (id int, name string) using hudi
@@ -111,7 +111,7 @@ abstract class HudiSuite extends WholeStageTransformerSuite
{
}
}
- testWithMinSparkVersion("hudi: partition filters", "3.2") {
+ test("hudi: partition filters") {
withTable("hudi_pf") {
spark.sql(s"""
|create table hudi_pf (id int, name string) using hudi
partitioned by (name)
diff --git
a/gluten-ut/test/src/test/scala/org/apache/gluten/expressions/GlutenExpressionMappingSuite.scala
b/gluten-ut/test/src/test/scala/org/apache/gluten/expressions/GlutenExpressionMappingSuite.scala
index 1c3fd99ee2..244b060d00 100644
---
a/gluten-ut/test/src/test/scala/org/apache/gluten/expressions/GlutenExpressionMappingSuite.scala
+++
b/gluten-ut/test/src/test/scala/org/apache/gluten/expressions/GlutenExpressionMappingSuite.scala
@@ -47,7 +47,7 @@ class GlutenExpressionMappingSuite
conf
}
- testWithMinSparkVersion("test expression blacklist", "3.2") {
+ test("test expression blacklist") {
val names = ExpressionMappings.expressionsMap.values.toSet
assert(names.contains("regexp_replace"))
assert(names.contains("regexp_extract"))
@@ -68,7 +68,7 @@ class GlutenExpressionMappingSuite
}
}
- testWithMinSparkVersion("test blacklisting regexp expressions", "3.2") {
+ test("test blacklisting regexp expressions") {
val names = ExpressionMappings.expressionsMap.values.toSet
assert(names.contains("rlike"))
assert(names.contains("regexp_replace"))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
