[GLUTEN-8689][VL] Enable some test cases in GlutenSQLQueryTestSuite (#…

…8690) * enable some test cases * update
apache · Feb 9, 2025 · c90f170 · c90f170
1 parent bdb68de
commit c90f170
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/...n-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala b/...n-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
@@ -26,6 +26,7 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
   // Put relative path to "/path/to/spark/sql/core/src/test/resources/sql-tests/inputs" in this list
   val SUPPORTED_SQL_QUERY_LIST: Set[String] =
     Set(
+      "array.sql",
       "bitwise.sql",
       "cast.sql",
       "change-column.sql",
@@ -63,10 +64,12 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
       "except-all.sql",
       "except.sql",
       "extract.sql",
+      "group-analytics.sql",
       "group-by-filter.sql",
       "group-by-ordinal.sql",
       "grouping_set.sql",
       "having.sql",
+      "higher-order-functions.sql",
       "ignored.sql",
       "inline-table.sql",
       "inner-join.sql",

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
@@ -213,9 +213,6 @@ class GlutenSQLQueryTestSuite
     "explain-aqe.sql", // explain plan is different
     "explain-cbo.sql", // explain
     "explain.sql", // explain
-    "group-analytics.sql", // wait velox to fix issue 3357
-    "array.sql", // blocked by VELOX-5768
-    "higher-order-functions.sql", // blocked by VELOX-5768
     "udf/udf-window.sql" // Local window fixes are not added.
   ) ++ otherIgnoreList
 

diff --git a/...n-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala b/...n-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
@@ -25,6 +25,7 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
 
   // Put relative path to "/path/to/spark/sql/core/src/test/resources/sql-tests/inputs" in this list
   private val SUPPORTED_SQL_QUERY_LIST: Set[String] = Set(
+    "array.sql",
     "bitwise.sql",
     "cast.sql",
     "change-column.sql",
@@ -61,10 +62,12 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
     "except-all.sql",
     "except.sql",
     "extract.sql",
+    "group-analytics.sql",
     "group-by-filter.sql",
     "group-by-ordinal.sql",
     "grouping_set.sql",
     "having.sql",
+    "higher-order-functions.sql",
     "ignored.sql",
     "ilike-all.sql",
     "ilike-any.sql",

diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala
@@ -213,9 +213,6 @@ class GlutenSQLQueryTestSuite
     "explain-aqe.sql", // explain plan is different
     "explain-cbo.sql", // explain
     "explain.sql", // explain
-    "group-analytics.sql", // wait velox to fix issue 3357
-    "array.sql", // blocked by VELOX-5768
-    "higher-order-functions.sql", // blocked by VELOX-5768
     "udf/udf-window.sql", // Local window fixes are not added.
     "window.sql" // Local window fixes are not added.
   ) ++ otherIgnoreList

diff --git a/...n-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala b/...n-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
@@ -25,6 +25,7 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
 
   // Put relative path to "/path/to/spark/sql/core/src/test/resources/sql-tests/inputs" in this list
   val SUPPORTED_SQL_QUERY_LIST: Set[String] = Set(
+    "array.sql",
     "bitwise.sql",
     "cast.sql",
     "change-column.sql",
@@ -61,10 +62,12 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
     "except-all.sql",
     "except.sql",
     "extract.sql",
+    "group-analytics.sql",
     "group-by-filter.sql",
     "group-by-ordinal.sql",
     "grouping_set.sql",
     "having.sql",
+    "higher-order-functions.sql",
     "ignored.sql",
     "ilike-all.sql",
     "ilike-any.sql",

diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala
@@ -213,6 +213,7 @@ class GlutenSQLQueryTestSuite
 
   // 3.4 inadvertently enabled with "group-by.sql" and "group-by-ordinal.sql"
   private val udafIgnoreList = Set(
+    "udaf/udaf-group-analytics.sql",
     "udaf/udaf-group-by-ordinal.sql",
     "udaf/udaf-group-by.sql"
   )
@@ -223,9 +224,6 @@ class GlutenSQLQueryTestSuite
     "explain-aqe.sql", // explain plan is different
     "explain-cbo.sql", // explain
     "explain.sql", // explain
-    "group-analytics.sql", // wait velox to fix issue 3357
-    "array.sql", // blocked by VELOX-5768
-    "higher-order-functions.sql", // blocked by VELOX-5768
     "udf/udf-window.sql", // Local window fixes are not added.
     "window.sql" // Local window fixes are not added.
   ) ++ otherIgnoreList ++ udafIgnoreList

diff --git a/...n-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala b/...n-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
@@ -25,6 +25,7 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
 
   // Put relative path to "/path/to/spark/sql/core/src/test/resources/sql-tests/inputs" in this list
   val SUPPORTED_SQL_QUERY_LIST: Set[String] = Set(
+    "array.sql",
     "bitwise.sql",
     "cast.sql",
     "change-column.sql",
@@ -61,10 +62,12 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
     "except-all.sql",
     "except.sql",
     "extract.sql",
+    "group-analytics.sql",
     "group-by-filter.sql",
     "group-by-ordinal.sql",
     "grouping_set.sql",
     "having.sql",
+    "higher-order-functions.sql",
     "ignored.sql",
     "ilike-all.sql",
     "ilike-any.sql",

diff --git a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala
@@ -211,6 +211,7 @@ class GlutenSQLQueryTestSuite
 
   // 3.4 inadvertently enabled with "group-by.sql" and "group-by-ordinal.sql"
   private val udafIgnoreList = Set(
+    "udaf/udaf-group-analytics.sql",
     "udaf/udaf-group-by-ordinal.sql",
     "udaf/udaf-group-by.sql"
   )
@@ -221,9 +222,6 @@ class GlutenSQLQueryTestSuite
     "explain-aqe.sql", // explain plan is different
     "explain-cbo.sql", // explain
     "explain.sql", // explain
-    "group-analytics.sql", // wait velox to fix issue 3357
-    "array.sql", // blocked by VELOX-5768
-    "higher-order-functions.sql", // blocked by VELOX-5768
     "udf/udf-window.sql", // Local window fixes are not added.
     "window.sql", // Local window fixes are not added.
     // Disable for Spark 3.