fix velox compile issue by introducing def enableSuite(suiteName: Str…

…ing) to avoid explicitly refer test suite
apache · Aug 19, 2024 · 51e258f · 51e258f
1 parent a73f632
commit 51e258f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 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
@@ -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/...ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/...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/...ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/...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")