You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by yu...@apache.org on 2025/02/09 23:30:15 UTC
(incubator-gluten) branch main updated: [GLUTEN-8689][VL] Enable some test cases in GlutenSQLQueryTestSuite (#8690)
This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new c90f17088a [GLUTEN-8689][VL] Enable some test cases in GlutenSQLQueryTestSuite (#8690)
c90f17088a is described below
commit c90f17088a26897500a08e4aeddbbe3cda09d6ac
Author: Rong Ma <ro...@intel.com>
AuthorDate: Sun Feb 9 23:30:11 2025 +0000
[GLUTEN-8689][VL] Enable some test cases in GlutenSQLQueryTestSuite (#8690)
* enable some test cases
* update
---
.../org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala | 3 +++
.../src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala | 3 ---
.../org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala | 3 +++
.../src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala | 3 ---
.../org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala | 3 +++
.../src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala | 4 +---
.../org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala | 3 +++
.../src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala | 4 +---
8 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
index ae5c78c565..739cb44e3b 100644
--- a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
+++ b/gluten-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
index 7a4b1c7816..de6c9e7ff3 100644
--- 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/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
index 00a45d713e..d4004b6424 100644
--- a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
+++ b/gluten-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
index e336ca88a7..9c1bf9cbe1 100644
--- 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/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
index 345971e9ff..d49e9ccc66 100644
--- a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
+++ b/gluten-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
index 39a36898af..ce5d50b175 100644
--- 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/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
index 345971e9ff..d49e9ccc66 100644
--- a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
+++ b/gluten-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
index 01d36635f3..5810cc5abe 100644
--- 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org