This is an automated email from the ASF dual-hosted git repository.
zml1206 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 ef647cac78 [CORE] Limit SparkSessionExtension suite to Gluten test
(#12475)
ef647cac78 is described below
commit ef647cac78e216ab475b4ab87a2c2c8694ccb1df
Author: Mingliang Zhu <[email protected]>
AuthorDate: Thu Jul 9 13:33:13 2026 +0800
[CORE] Limit SparkSessionExtension suite to Gluten test (#12475)
---
.../org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala | 2 ++
.../scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 2 ++
.../org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala | 2 ++
.../scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 2 ++
.../org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala | 2 ++
.../scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 2 ++
.../org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala | 2 ++
.../scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 4 +++-
.../org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala | 4 +++-
.../org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala | 2 ++
.../scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 4 +++-
.../org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala | 6 +++---
12 files changed, 28 insertions(+), 6 deletions(-)
diff --git
a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index ceb41965b4..dc887eb3b1 100644
---
a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++
b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -45,6 +45,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit
class ClickHouseTestSettings extends BackendTestSettings {
+ import SuiteSettings._
// disable tests that will break the whole UT
override def shouldRun(suiteName: String, testName: String): Boolean = {
@@ -1881,6 +1882,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
.excludeGlutenTest("fallbackSummary with cache")
.excludeGlutenTest("fallbackSummary with cached data and shuffle")
enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenHiveSQLQueryCHSuite]
enableSuite[GlutenPercentileSuite]
diff --git
a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 112b5e585d..7bed4ae576 100644
---
a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -46,6 +46,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit
class VeloxTestSettings extends BackendTestSettings {
+ import SuiteSettings._
enableSuite[GlutenStringFunctionsSuite]
enableSuite[GlutenBloomFilterAggregateQuerySuite]
enableSuite[GlutenBloomFilterAggregateQuerySuiteCGOff]
@@ -910,6 +911,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenImplicitsTest]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenSQLCollectLimitExecSuite]
enableSuite[GlutenBatchEvalPythonExecSuite]
// Replaced with other tests that check for native operations
diff --git
a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index cd7d0748fe..279e99dc0f 100644
---
a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++
b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -45,6 +45,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit
class ClickHouseTestSettings extends BackendTestSettings {
+ import SuiteSettings._
// disable tests that will break the whole UT
override def shouldRun(suiteName: String, testName: String): Boolean = {
@@ -1740,6 +1741,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
"SELECT structFieldSimple.key, arrayFieldSimple[1] FROM tableWithSchema
a where int_Field=1")
.exclude("SELECT structFieldComplex.Value.`value_(2)` FROM
tableWithSchema")
enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenHiveSQLQueryCHSuite]
enableSuite[GlutenPercentileSuite]
enableSuite[GlutenTryCastSuite]
diff --git
a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index a596fa763b..138db034ea 100644
---
a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -47,6 +47,7 @@ import
org.apache.spark.sql.sources.{GlutenBucketedReadWithoutHiveSupportSuite,
// scalastyle:off line.size.limit
class VeloxTestSettings extends BackendTestSettings {
+ import SuiteSettings._
enableSuite[GlutenStringFunctionsSuite]
enableSuite[GlutenBloomFilterAggregateQuerySuite]
enableSuite[GlutenDataSourceV2DataFrameSessionCatalogSuite]
@@ -955,6 +956,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenWindowQuerySuite]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
enableSuite[GlutenDataFrameToSchemaSuite]
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index 3c48f1205b..c6fb6625b4 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -44,6 +44,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit
class ClickHouseTestSettings extends BackendTestSettings {
+ import SuiteSettings._
enableSuite[ClickHouseAdaptiveQueryExecSuite]
.includeAllGlutenTests()
@@ -2100,6 +2101,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false,
sortOrder=List('a DESC NULLS LAST)")
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false,
sortOrder=List('a DESC NULLS FIRST)")
enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenStatisticsCollectionSuite]
// The output byte size of Velox is different
.includeCH("SPARK-33687: analyze all tables in a specific database")
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 1c36a9bb85..b439e367fc 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
@@ -46,6 +46,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit
class VeloxTestSettings extends BackendTestSettings {
+ import SuiteSettings._
enableSuite[GlutenStringFunctionsSuite]
enableSuite[GlutenBloomFilterAggregateQuerySuite]
enableSuite[GlutenBloomFilterAggregateQuerySuiteCGOff]
@@ -913,6 +914,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenWindowQuerySuite]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
enableSuite[GlutenDataFrameToSchemaSuite]
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index 9c9a4c7699..f1f010328b 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -43,6 +43,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit
class ClickHouseTestSettings extends BackendTestSettings {
+ import SuiteSettings._
enableSuite[ClickHouseAdaptiveQueryExecSuite]
.includeAllGlutenTests()
@@ -2073,6 +2074,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false,
sortOrder=List('a DESC NULLS LAST)")
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false,
sortOrder=List('a DESC NULLS FIRST)")
enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenStatisticsCollectionSuite]
// The output byte size of Velox is different
.includeCH("SPARK-33687: analyze all tables in a specific database")
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 a8d5cf2135..bf2f77b623 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
@@ -49,6 +49,7 @@ import org.apache.spark.sql.streaming._
// scalastyle:off line.size.limit
class VeloxTestSettings extends BackendTestSettings {
+ import SuiteSettings._
private val ansiNoFallback: Boolean =
sys.props.get(GlutenConfig.GLUTEN_ANSI_FALLBACK_ENABLED.key).contains("false")
enableSuite[GlutenStringFunctionsSuite]
@@ -1144,7 +1145,8 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSQLQuerySuiteAE]
enableSuite[GlutenWindowQuerySuite]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
- // TODO: 4.x enableSuite[GlutenSparkSessionExtensionSuite] // 1 failure
+ enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
enableSuite[GlutenDataFrameToSchemaSuite]
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala
index daf54dff1b..ae9b3901af 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala
@@ -18,7 +18,9 @@ package org.apache.spark.sql
import org.apache.gluten.config.GlutenConfig
-class GlutenSparkSessionExtensionSuite extends SparkSessionExtensionSuite with
GlutenTestsTrait {
+class GlutenSparkSessionExtensionSuite
+ extends SparkSessionExtensionSuite
+ with GlutenTestsCommonTrait {
testGluten("customColumnarOp") {
val extensions = DummyFilterColmnarHelper.create {
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index 9c9a4c7699..f1f010328b 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -43,6 +43,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit
class ClickHouseTestSettings extends BackendTestSettings {
+ import SuiteSettings._
enableSuite[ClickHouseAdaptiveQueryExecSuite]
.includeAllGlutenTests()
@@ -2073,6 +2074,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false,
sortOrder=List('a DESC NULLS LAST)")
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false,
sortOrder=List('a DESC NULLS FIRST)")
enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenStatisticsCollectionSuite]
// The output byte size of Velox is different
.includeCH("SPARK-33687: analyze all tables in a specific database")
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 0d373793ad..7048695d3e 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -49,6 +49,7 @@ import org.apache.spark.sql.streaming._
// scalastyle:off line.size.limit
class VeloxTestSettings extends BackendTestSettings {
+ import SuiteSettings._
private val ansiNoFallback: Boolean =
sys.props.get(GlutenConfig.GLUTEN_ANSI_FALLBACK_ENABLED.key).contains("false")
enableSuite[GlutenStringFunctionsSuite]
@@ -1143,7 +1144,8 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSQLQuerySuiteAE]
enableSuite[GlutenWindowQuerySuite]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
- // TODO: 4.x enableSuite[GlutenSparkSessionExtensionSuite] // 1 failure
+ enableSuite[GlutenSparkSessionExtensionSuite]
+ .includeGlutenTest("customColumnarOp")
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
enableSuite[GlutenDataFrameToSchemaSuite]
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala
index d21fbf6e82..ae9b3901af 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala
@@ -18,9 +18,9 @@ package org.apache.spark.sql
import org.apache.gluten.config.GlutenConfig
-import org.apache.spark.sql.shim.GlutenTestsTrait
-
-class GlutenSparkSessionExtensionSuite extends SparkSessionExtensionSuite with
GlutenTestsTrait {
+class GlutenSparkSessionExtensionSuite
+ extends SparkSessionExtensionSuite
+ with GlutenTestsCommonTrait {
testGluten("customColumnarOp") {
val extensions = DummyFilterColmnarHelper.create {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
