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 53893cd75a [CORE] Add explicit tracking for disabled test suites
(#12512)
53893cd75a is described below
commit 53893cd75ae24260a3e8386ec9795a2817aef854
Author: Mingliang Zhu <[email protected]>
AuthorDate: Thu Jul 16 11:59:35 2026 +0800
[CORE] Add explicit tracking for disabled test suites (#12512)
---
.../apache/gluten/utils/BackendTestSettings.scala | 35 ++++++++++++----------
.../utils/clickhouse/ClickHouseTestSettings.scala | 5 ++--
.../gluten/utils/velox/VeloxTestSettings.scala | 5 ++--
.../utils/clickhouse/ClickHouseTestSettings.scala | 5 ++--
.../gluten/utils/velox/VeloxTestSettings.scala | 5 ++--
.../utils/clickhouse/ClickHouseTestSettings.scala | 5 ++--
.../gluten/utils/velox/VeloxTestSettings.scala | 5 ++--
.../utils/clickhouse/ClickHouseTestSettings.scala | 5 ++--
.../gluten/utils/velox/VeloxTestSettings.scala | 32 +++++++++++---------
.../GlutenSubExprEvaluationRuntimeSuite.scala | 23 ++++++++++++++
.../utils/clickhouse/ClickHouseTestSettings.scala | 5 ++--
.../gluten/utils/velox/VeloxTestSettings.scala | 32 +++++++++++---------
.../GlutenSubExprEvaluationRuntimeSuite.scala | 23 ++++++++++++++
13 files changed, 118 insertions(+), 67 deletions(-)
diff --git
a/gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestSettings.scala
b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestSettings.scala
index fa51e5ccc2..a6a2b26805 100644
---
a/gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestSettings.scala
+++
b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestSettings.scala
@@ -28,12 +28,16 @@ import scala.reflect.ClassTag
abstract class BackendTestSettings {
private val enabledSuites: java.util.Map[String, SuiteSettings] = new
util.HashMap()
+ private val disabledSuites: java.util.Map[String, String] = new
util.HashMap()
protected def enableSuite[T: ClassTag]: SuiteSettings = {
enableSuite(implicitly[ClassTag[T]].runtimeClass.getCanonicalName)
}
protected def enableSuite(suiteName: String): SuiteSettings = {
+ if (disabledSuites.containsKey(suiteName)) {
+ throw new IllegalArgumentException("Suite is already disabled: " +
suiteName)
+ }
if (enabledSuites.containsKey(suiteName)) {
throw new IllegalArgumentException("Duplicated suite name: " + suiteName)
}
@@ -42,18 +46,28 @@ abstract class BackendTestSettings {
suiteSettings
}
+ protected def disableSuite[T: ClassTag](reason: String): Unit = {
+ disableSuite(implicitly[ClassTag[T]].runtimeClass.getCanonicalName, reason)
+ }
+
+ protected def disableSuite(suiteName: String, reason: String): Unit = {
+ require(reason.nonEmpty, "Disable reason must not be empty")
+ if (enabledSuites.containsKey(suiteName)) {
+ throw new IllegalArgumentException("Suite is already enabled: " +
suiteName)
+ }
+ if (disabledSuites.containsKey(suiteName)) {
+ throw new IllegalArgumentException("Duplicated disabled suite: " +
suiteName)
+ }
+ disabledSuites.put(suiteName, reason)
+ }
+
private[utils] def shouldRun(suiteName: String, testName: String): Boolean =
{
- if (!enabledSuites.containsKey(suiteName)) {
+ if (disabledSuites.containsKey(suiteName) ||
!enabledSuites.containsKey(suiteName)) {
return false
}
val suiteSettings = enabledSuites.get(suiteName)
- suiteSettings.disableReason match {
- case Some(_) => return false
- case _ => // continue
- }
-
val inclusion = suiteSettings.inclusion.asScala
val exclusion = suiteSettings.exclusion.asScala
@@ -88,8 +102,6 @@ abstract class BackendTestSettings {
private[utils] val inclusion: util.List[IncludeBase] = new util.ArrayList()
private[utils] val exclusion: util.List[ExcludeBase] = new util.ArrayList()
- private[utils] var disableReason: Option[String] = None
-
def include(testNames: String*): SuiteSettings = {
inclusion.add(Include(testNames: _*))
this
@@ -114,13 +126,6 @@ abstract class BackendTestSettings {
this
}
- def disable(reason: String): SuiteSettings = {
- disableReason = disableReason match {
- case Some(r) => throw new IllegalArgumentException("Disable reason
already set: " + r)
- case None => Some(reason)
- }
- this
- }
}
object SuiteSettings {
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 7a77f7c4f3..b0b767cd91 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
@@ -1853,9 +1853,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
.exclude("CREATE TABLE USING AS SELECT based on the file without write
permission")
.exclude("create a table, drop it and create another one with the same
name")
enableSuite[GlutenDDLSourceLoadSuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenExternalCommandRunnerSuite]
enableSuite[GlutenFilteredScanSuite]
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 7bed4ae576..0ba7d7796c 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
@@ -604,9 +604,8 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("CREATE TABLE USING AS SELECT based on the file without write
permission")
.exclude("create a table, drop it and create another one with the same
name")
enableSuite[GlutenDDLSourceLoadSuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenExternalCommandRunnerSuite]
enableSuite[GlutenFilteredScanSuite]
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 53078da7a3..214d677cdd 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
@@ -1715,9 +1715,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
.exclude("CREATE TABLE USING AS SELECT based on the file without write
permission")
.exclude("create a table, drop it and create another one with the same
name")
enableSuite[GlutenDDLSourceLoadSuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenExternalCommandRunnerSuite]
enableSuite[GlutenFilteredScanSuite]
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 138db034ea..e7cda00f71 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
@@ -626,9 +626,8 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("CREATE TABLE USING AS SELECT based on the file without write
permission")
.exclude("create a table, drop it and create another one with the same
name")
enableSuite[GlutenDDLSourceLoadSuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenExternalCommandRunnerSuite]
enableSuite[GlutenFilteredScanSuite]
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 c6fb6625b4..920554f91e 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
@@ -752,9 +752,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
.includeCH("update char/varchar columns")
enableSuite[GlutenDeltaBasedUpdateTableSuite]
enableSuite[GlutenDeprecatedAPISuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenDynamicPartitionPruningV1SuiteAEOff]
.excludeGlutenTest("Subquery reuse across the whole plan")
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 b439e367fc..e7a8c93ba8 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
@@ -586,9 +586,8 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("CREATE TABLE USING AS SELECT based on the file without write
permission")
.exclude("create a table, drop it and create another one with the same
name")
enableSuite[GlutenDDLSourceLoadSuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenExternalCommandRunnerSuite]
enableSuite[GlutenFilteredScanSuite]
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 f1f010328b..90ad2f598d 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
@@ -737,9 +737,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
.includeCH("update char/varchar columns")
enableSuite[GlutenDeltaBasedUpdateTableSuite]
enableSuite[GlutenDeprecatedAPISuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenDynamicPartitionPruningV1SuiteAEOff]
.excludeGlutenTest("Subquery reuse across the whole plan")
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 d311a3ab70..63bcb02f14 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
@@ -234,8 +234,9 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenCsvExpressionsSuite]
enableSuite[GlutenDynamicPruningSubquerySuite]
enableSuite[GlutenExprIdSuite]
- // GlutenExpressionEvalHelperSuite is not enabled: it validates Spark's
ExpressionEvalHelper
- // contract, while Gluten overrides
checkEvaluation/checkExceptionInExpression.
+ disableSuite[GlutenExpressionEvalHelperSuite](
+ "Validates Spark's ExpressionEvalHelper contract, while Gluten overrides "
+
+ "checkEvaluation/checkExceptionInExpression")
enableSuite[GlutenExpressionImplUtilsSuite]
enableSuite[GlutenExpressionSQLBuilderSuite]
enableSuite[GlutenExpressionSetSuite]
@@ -243,15 +244,17 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenHexSuite]
enableSuite[GlutenMutableProjectionSuite]
enableSuite[GlutenNamedExpressionSuite]
- // GlutenObjectExpressionsSuite is not enabled: object/encoder interpreted
execution is
- // JVM-side coverage and currently fails under Gluten's expression
evaluation harness.
+ disableSuite[GlutenObjectExpressionsSuite](
+ "Object/encoder interpreted execution is JVM-side coverage and currently
fails under " +
+ "Gluten's expression evaluation harness")
enableSuite[GlutenOrderingSuite]
- // GlutenScalaUDFSuite is not enabled: ScalaUDF executes on the JVM/fallback
path, so
- // this parent suite has limited Velox coverage value and still has one
inherited failure.
+ disableSuite[GlutenScalaUDFSuite](
+ "ScalaUDF executes on the JVM/fallback path, so this parent suite has
limited Velox " +
+ "coverage value and still has one inherited failure")
enableSuite[GlutenSchemaPruningSuite]
enableSuite[GlutenSelectedFieldSuite]
- // GlutenSubExprEvaluationRuntimeSuite is removed because
SubExprEvaluationRuntimeSuite
- // is in test-jar without shaded Guava, while SubExprEvaluationRuntime is
shaded.
+ disableSuite[GlutenSubExprEvaluationRuntimeSuite](
+ "Spark's test JAR uses unshaded Guava, while SubExprEvaluationRuntime uses
shaded Guava")
enableSuite[GlutenSubexpressionEliminationSuite]
enableSuite[GlutenTimeWindowSuite]
enableSuite[GlutenToPrettyStringSuite]
@@ -734,8 +737,9 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenLogicalPlanTagInSparkPlanSuite]
enableSuite[GlutenOptimizeMetadataOnlyQuerySuite]
enableSuite[GlutenPersistedViewTestSuite]
- // TODO: 4.x enableSuite[GlutenPlannerSuite] // 1 failure
- // TODO: 4.x enableSuite[GlutenProjectedOrderingAndPartitioningSuite] // 6
failures
+ disableSuite[GlutenPlannerSuite]("Validates Spark planner implementation
details")
+ disableSuite[GlutenProjectedOrderingAndPartitioningSuite](
+ "Validates Spark planner output ordering and partitioning metadata")
enableSuite[GlutenQueryPlanningTrackerEndToEndSuite]
// TODO: 4.x enableSuite[GlutenRemoveRedundantProjectsSuite] // 14 failures
enableSuite[GlutenRemoveRedundantSortsSuite]
@@ -759,7 +763,8 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenUnsafeFixedWidthAggregationMapSuite]
enableSuite[GlutenUnsafeKVExternalSorterSuite]
enableSuite[GlutenUnsafeRowSerializerSuite]
- // TODO: 4.x enableSuite[GlutenWholeStageCodegenSparkSubmitSuite] // 1
failure
+ disableSuite[GlutenWholeStageCodegenSparkSubmitSuite](
+ "The SparkSubmit test launches Spark's main class without the Gluten
plugin")
enableSuite[GlutenWholeStageCodegenSuite]
// Rewrite with Gluten-aware native whole-stage plan assertions.
.exclude("range/filter should be combined")
@@ -839,9 +844,8 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("CREATE TABLE USING AS SELECT based on the file without write
permission")
.exclude("create a table, drop it and create another one with the same
name")
enableSuite[GlutenDDLSourceLoadSuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenExternalCommandRunnerSuite]
enableSuite[GlutenFilteredScanSuite]
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubExprEvaluationRuntimeSuite.scala
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubExprEvaluationRuntimeSuite.scala
new file mode 100644
index 0000000000..1e2b81e70a
--- /dev/null
+++
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubExprEvaluationRuntimeSuite.scala
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.spark.sql.catalyst.expressions
+
+import org.apache.spark.sql.GlutenTestsTrait
+
+class GlutenSubExprEvaluationRuntimeSuite
+ extends SubExprEvaluationRuntimeSuite
+ with GlutenTestsTrait {}
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 f1f010328b..90ad2f598d 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
@@ -737,9 +737,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
.includeCH("update char/varchar columns")
enableSuite[GlutenDeltaBasedUpdateTableSuite]
enableSuite[GlutenDeprecatedAPISuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenDynamicPartitionPruningV1SuiteAEOff]
.excludeGlutenTest("Subquery reuse across the whole plan")
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 41c07afb36..d6c003a756 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
@@ -243,8 +243,9 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenCsvExpressionsSuite]
enableSuite[GlutenDynamicPruningSubquerySuite]
enableSuite[GlutenExprIdSuite]
- // GlutenExpressionEvalHelperSuite is not enabled: it validates Spark's
ExpressionEvalHelper
- // contract, while Gluten overrides
checkEvaluation/checkExceptionInExpression.
+ disableSuite[GlutenExpressionEvalHelperSuite](
+ "Validates Spark's ExpressionEvalHelper contract, while Gluten overrides "
+
+ "checkEvaluation/checkExceptionInExpression")
enableSuite[GlutenExpressionImplUtilsSuite]
enableSuite[GlutenExpressionSQLBuilderSuite]
enableSuite[GlutenExpressionSetSuite]
@@ -252,15 +253,17 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenHexSuite]
enableSuite[GlutenMutableProjectionSuite]
enableSuite[GlutenNamedExpressionSuite]
- // GlutenObjectExpressionsSuite is not enabled: object/encoder interpreted
execution is
- // JVM-side coverage and currently fails under Gluten's expression
evaluation harness.
+ disableSuite[GlutenObjectExpressionsSuite](
+ "Object/encoder interpreted execution is JVM-side coverage and currently
fails under " +
+ "Gluten's expression evaluation harness")
enableSuite[GlutenOrderingSuite]
- // GlutenScalaUDFSuite is not enabled: ScalaUDF executes on the JVM/fallback
path, so
- // this parent suite has limited Velox coverage value and still has one
inherited failure.
+ disableSuite[GlutenScalaUDFSuite](
+ "ScalaUDF executes on the JVM/fallback path, so this parent suite has
limited Velox " +
+ "coverage value and still has one inherited failure")
enableSuite[GlutenSchemaPruningSuite]
enableSuite[GlutenSelectedFieldSuite]
- // GlutenSubExprEvaluationRuntimeSuite is removed because
SubExprEvaluationRuntimeSuite
- // is in test-jar without shaded Guava, while SubExprEvaluationRuntime is
shaded.
+ disableSuite[GlutenSubExprEvaluationRuntimeSuite](
+ "Spark's test JAR uses unshaded Guava, while SubExprEvaluationRuntime uses
shaded Guava")
enableSuite[GlutenSubexpressionEliminationSuite]
enableSuite[GlutenTimeWindowSuite]
enableSuite[GlutenToPrettyStringSuite]
@@ -713,8 +716,9 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenLogicalPlanTagInSparkPlanSuite]
enableSuite[GlutenOptimizeMetadataOnlyQuerySuite]
enableSuite[GlutenPersistedViewTestSuite]
- // TODO: 4.x enableSuite[GlutenPlannerSuite] // 1 failure
- // TODO: 4.x enableSuite[GlutenProjectedOrderingAndPartitioningSuite] // 6
failures
+ disableSuite[GlutenPlannerSuite]("Validates Spark planner implementation
details")
+ disableSuite[GlutenProjectedOrderingAndPartitioningSuite](
+ "Validates Spark planner output ordering and partitioning metadata")
enableSuite[GlutenQueryPlanningTrackerEndToEndSuite]
// TODO: 4.x enableSuite[GlutenRemoveRedundantProjectsSuite] // 14 failures
enableSuite[GlutenRemoveRedundantSortsSuite]
@@ -738,7 +742,8 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenUnsafeFixedWidthAggregationMapSuite]
enableSuite[GlutenUnsafeKVExternalSorterSuite]
enableSuite[GlutenUnsafeRowSerializerSuite]
- // TODO: 4.x enableSuite[GlutenWholeStageCodegenSparkSubmitSuite] // 1
failure
+ disableSuite[GlutenWholeStageCodegenSparkSubmitSuite](
+ "The SparkSubmit test launches Spark's main class without the Gluten
plugin")
enableSuite[GlutenWholeStageCodegenSuite]
// Rewrite with Gluten-aware native whole-stage plan assertions.
.exclude("range/filter should be combined")
@@ -820,9 +825,8 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("CREATE TABLE USING AS SELECT based on the file without write
permission")
.exclude("create a table, drop it and create another one with the same
name")
enableSuite[GlutenDDLSourceLoadSuite]
- enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite]
- .disable(
- "DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly
matching the class type")
+ disableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuite](
+ "GLUTEN-4893: Vanilla UT checks scan operator by exactly matching the
class type")
enableSuite[GlutenDisableUnnecessaryBucketedScanWithoutHiveSupportSuiteAE]
enableSuite[GlutenExternalCommandRunnerSuite]
enableSuite[GlutenFilteredScanSuite]
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubExprEvaluationRuntimeSuite.scala
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubExprEvaluationRuntimeSuite.scala
new file mode 100644
index 0000000000..6087078c45
--- /dev/null
+++
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubExprEvaluationRuntimeSuite.scala
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.spark.sql.catalyst.expressions
+
+import org.apache.spark.sql.shim.GlutenTestsTrait
+
+class GlutenSubExprEvaluationRuntimeSuite
+ extends SubExprEvaluationRuntimeSuite
+ with GlutenTestsTrait {}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
