From d81eb7789b8c56c11850c7941f087d8e48e2b159 Mon Sep 17 00:00:00 2001 From: zml1206 Date: Wed, 15 Jul 2026 10:47:05 +0800 Subject: [PATCH 1/3] [VL] Add explicit tracking for disabled test suites --- .../gluten/utils/BackendTestSettings.scala | 21 ++++++++++++++++- .../utils/velox/VeloxTestSettings.scala | 19 ++++++++------- .../GlutenSubExprEvaluationRuntimeSuite.scala | 23 +++++++++++++++++++ .../utils/velox/VeloxTestSettings.scala | 19 ++++++++------- .../GlutenSubExprEvaluationRuntimeSuite.scala | 23 +++++++++++++++++++ 5 files changed, 88 insertions(+), 17 deletions(-) create mode 100644 gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubExprEvaluationRuntimeSuite.scala create mode 100644 gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubExprEvaluationRuntimeSuite.scala 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 fa51e5ccc28..1beb062531d 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,8 +46,23 @@ 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 } 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 d311a3ab702..57ce614261c 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] 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 00000000000..1e2b81e70a3 --- /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/velox/VeloxTestSettings.scala b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index 41c07afb365..8e0722294ca 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] 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 00000000000..6087078c45f --- /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 {} From c763859a8d3d025cddde495a13308a106b53bb51 Mon Sep 17 00:00:00 2001 From: zml1206 Date: Wed, 15 Jul 2026 11:13:40 +0800 Subject: [PATCH 2/3] disable some suite --- .../org/apache/gluten/utils/velox/VeloxTestSettings.scala | 8 +++++--- .../org/apache/gluten/utils/velox/VeloxTestSettings.scala | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) 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 57ce614261c..442e313b28c 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 @@ -737,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] @@ -762,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") 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 8e0722294ca..f2afe0b2bb3 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 @@ -716,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] @@ -741,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") From 66b5157e56daa49b575dbc37977a22838b5e4da1 Mon Sep 17 00:00:00 2001 From: zml1206 Date: Wed, 15 Jul 2026 14:10:14 +0800 Subject: [PATCH 3/3] [CORE] Replace SuiteSettings.disable with disableSuite --- .../apache/gluten/utils/BackendTestSettings.scala | 14 -------------- .../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 | 5 ++--- .../utils/clickhouse/ClickHouseTestSettings.scala | 5 ++--- .../gluten/utils/velox/VeloxTestSettings.scala | 5 ++--- 11 files changed, 20 insertions(+), 44 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 1beb062531d..a6a2b26805e 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 @@ -68,11 +68,6 @@ abstract class BackendTestSettings { val suiteSettings = enabledSuites.get(suiteName) - suiteSettings.disableReason match { - case Some(_) => return false - case _ => // continue - } - val inclusion = suiteSettings.inclusion.asScala val exclusion = suiteSettings.exclusion.asScala @@ -107,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 @@ -133,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 7a77f7c4f30..b0b767cd91a 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 7bed4ae576f..0ba7d7796ce 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 53078da7a3a..214d677cdde 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 138db034ea0..e7cda00f718 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 c6fb6625b44..920554f91e8 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 b439e367fc5..e7a8c93ba8a 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 f1f010328bc..90ad2f598d3 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 442e313b28c..63bcb02f142 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 @@ -844,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/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 f1f010328bc..90ad2f598d3 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 f2afe0b2bb3..d6c003a756e 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 @@ -825,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]