fix up

apache · Nov 20, 2023 · e453be9 · e453be9
1 parent fc33106
commit e453be9
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 12 deletions.
diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHTestApi.scala b/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHTestApi.scala
@@ -22,7 +22,4 @@ class CHTestApi extends TestApi {
   override def getSupportedSQLQueryTests: Set[String] = Set[String]()
 
   override def getOverwriteSQLQueryTests: Set[String] = Set[String]()
-
-  override def getOverwriteSQLQueryResourcePath: String =
-    getClass.getResource("/") + "../../test/resources/resources/sql-tests"
 }
diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/TestApiImpl.scala b/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/TestApiImpl.scala
@@ -210,7 +210,4 @@ class TestApiImpl extends TestApi {
     // Remove corr in udf/udf-group-by.sql
     "udf/udf-group-by.sql"
   )
-
-  override def getOverwriteSQLQueryResourcePath: String =
-    getClass.getResource("/") + "../../test/resources/resources/sql-tests"
 }
diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/TestApi.scala b/gluten-core/src/main/scala/io/glutenproject/backendsapi/TestApi.scala
@@ -20,6 +20,4 @@ trait TestApi {
   def getSupportedSQLQueryTests: Set[String]
 
   def getOverwriteSQLQueryTests: Set[String]
-
-  def getOverwriteSQLQueryResourcePath: String
 }
diff --git a/...t/resources/sql-tests/inputs/group-by.sql → ...t/resources/sql-tests/inputs/group-by.sql b/...t/resources/sql-tests/inputs/group-by.sql → ...t/resources/sql-tests/inputs/group-by.sql
diff --git a/...ces/sql-tests/inputs/udf/udf-group-by.sql → ...ces/sql-tests/inputs/udf/udf-group-by.sql b/...ces/sql-tests/inputs/udf/udf-group-by.sql → ...ces/sql-tests/inputs/udf/udf-group-by.sql
diff --git a/...ources/sql-tests/results/group-by.sql.out → ...ources/sql-tests/results/group-by.sql.out b/...ources/sql-tests/results/group-by.sql.out → ...ources/sql-tests/results/group-by.sql.out
diff --git a/...ql-tests/results/udf/udf-group-by.sql.out → ...ql-tests/results/udf/udf-group-by.sql.out b/...ql-tests/results/udf/udf-group-by.sql.out → ...ql-tests/results/udf/udf-group-by.sql.out
diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala
@@ -157,7 +157,7 @@ class GlutenSQLQueryTestSuite
   protected val testDataPath = new File(resourcesPath, "test-data").getAbsolutePath
 
   protected val overwriteResourcePath =
-    BackendsApiManager.getTestApiInstance.getOverwriteSQLQueryResourcePath
+    getClass.getResource("/").getPath + "../../../src/test/resources/sql-tests"
 
   protected val overwriteInputFilePath = new File(overwriteResourcePath, "inputs").getAbsolutePath
   protected val overwriteGoldenFilePath = new File(overwriteResourcePath, "results").getAbsolutePath
@@ -611,10 +611,12 @@ class GlutenSQLQueryTestSuite
       }
     }
 
-    listFilesRecursively(new File(inputFilePath))
-      .flatMap(createTestCase(_, inputFilePath, goldenFilePath)) ++ listFilesRecursively(
-      new File(overwriteInputFilePath))
+    val overwriteTestCases = listFilesRecursively(new File(overwriteInputFilePath))
       .flatMap(createTestCase(_, overwriteInputFilePath, overwriteGoldenFilePath))
+    val overwriteTestCaseNames = overwriteTestCases.map(_.name)
+    listFilesRecursively(new File(inputFilePath))
+      .flatMap(createTestCase(_, inputFilePath, goldenFilePath))
+      .filterNot(testCase => overwriteTestCaseNames.contains(testCase.name)) ++ overwriteTestCases
   }
 
   /** Returns all the files (not directories) in a directory, recursively. */