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 987635d067be..dce8ac83710c 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 @@ -30,7 +30,10 @@ abstract class BackendTestSettings { private val enabledSuites: java.util.Map[String, SuiteSettings] = new util.HashMap() protected def enableSuite[T: ClassTag]: SuiteSettings = { - val suiteName = implicitly[ClassTag[T]].runtimeClass.getCanonicalName + enableSuite(implicitly[ClassTag[T]].runtimeClass.getCanonicalName) + } + + protected def enableSuite(suiteName: String): SuiteSettings = { if (enabledSuites.containsKey(suiteName)) { throw new IllegalArgumentException("Duplicated suite name: " + suiteName) } 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 f00d6cccd068..660d693cce3f 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 @@ -16,7 +16,6 @@ */ package org.apache.gluten.utils.clickhouse -import org.apache.gluten.execution.parquet.GlutenParquetV1FilterSuite2 import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings} import org.apache.spark.sql._ @@ -1601,7 +1600,7 @@ class ClickHouseTestSettings extends BackendTestSettings { .exclude("SPARK-38825: in and notIn filters") .exclude("SPARK-36866: filter pushdown - year-month interval") .excludeGlutenTest("SPARK-25207: exception when duplicate fields in case-insensitive mode") - enableSuite[GlutenParquetV1FilterSuite2] + enableSuite("org.apache.gluten.execution.parquet.GlutenParquetV1FilterSuite2") .exclude("filter pushdown - date") .exclude("filter pushdown - timestamp") .exclude("Filters should be pushed down for vectorized Parquet reader at row group level") 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 37f94175a40e..72d6f79c117e 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 @@ -16,7 +16,6 @@ */ package org.apache.gluten.utils.clickhouse -import org.apache.gluten.execution.parquet.GlutenParquetV1FilterSuite2 import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings} import org.apache.spark.sql._ @@ -1442,7 +1441,7 @@ class ClickHouseTestSettings extends BackendTestSettings { .exclude("filter pushdown - StringContains") .exclude("filter pushdown - StringPredicate") .excludeGlutenTest("SPARK-25207: exception when duplicate fields in case-insensitive mode") - enableSuite[GlutenParquetV1FilterSuite2] + enableSuite("org.apache.gluten.execution.parquet.GlutenParquetV1FilterSuite2") .exclude("filter pushdown - date") .exclude("filter pushdown - timestamp") .exclude("Filters should be pushed down for vectorized Parquet reader at row group level")