This is an automated email from the ASF dual-hosted git repository.
philo-he pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gluten.git
The following commit(s) were added to refs/heads/main by this push:
new d8b14acf66 [GLUTEN-11916][VL] Re-enable 5 Spark 4.1 SQL query test
files (#12146)
d8b14acf66 is described below
commit d8b14acf6697a54ebf02310419b8775749bc9cb2
Author: rdtr <[email protected]>
AuthorDate: Sun Oct 4 19:48:00 2026 -0700
[GLUTEN-11916][VL] Re-enable 5 Spark 4.1 SQL query test files (#12146)
---
.../backends-velox/sql-tests/results/cast.sql.out | 9 +++------
.../sql-tests/results/literals.sql.out | 6 ++----
.../sql-tests/results/nonansi/cast.sql.out | 12 ++++--------
.../sql-tests/results/nonansi/literals.sql.out | 6 ++----
.../results/type-coercion-edge-cases.sql.out | 21 ++-------------------
.../utils/velox/VeloxSQLQueryTestSettings.scala | 10 +++++-----
6 files changed, 18 insertions(+), 46 deletions(-)
diff --git
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/cast.sql.out
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/cast.sql.out
index 2ebdcb6cbc..ca2f739113 100644
---
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/cast.sql.out
+++
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/cast.sql.out
@@ -1092,8 +1092,7 @@ org.apache.spark.SparkNumberFormatException
select cast('\t\t true \n\r ' as boolean)
-- !query schema
struct<CAST( true
-
- AS BOOLEAN):boolean>
+ AS BOOLEAN):boolean>
-- !query output
true
@@ -1102,8 +1101,7 @@ true
select cast('\t\n false \t\r' as boolean)
-- !query schema
struct<CAST(
- false
- AS BOOLEAN):boolean>
+ false AS BOOLEAN):boolean>
-- !query output
false
@@ -1998,8 +1996,7 @@ struct<CAST(1.0 AS DECIMAL(10,0)):decimal(10,0)>
select '\t\t true \n\r ' :: boolean
-- !query schema
struct<CAST( true
-
- AS BOOLEAN):boolean>
+ AS BOOLEAN):boolean>
-- !query output
true
diff --git
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/literals.sql.out
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/literals.sql.out
index 29b93893b5..410b55bdd4 100644
---
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/literals.sql.out
+++
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/literals.sql.out
@@ -360,12 +360,10 @@ pattern% no-pattern\% pattern\% pattern\\%
select '\'', '"', '\n', '\r', '\t', 'Z'
-- !query schema
struct<':string,":string,
-:string,
-:string, :string,Z:string>
+:string, :string, :string,Z:string>
-- !query output
' "
-
- Z
+ Z
-- !query
diff --git
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/nonansi/cast.sql.out
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/nonansi/cast.sql.out
index d01da5d007..64d7b35970 100644
---
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/nonansi/cast.sql.out
+++
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/nonansi/cast.sql.out
@@ -489,8 +489,7 @@ NULL
select cast('\t\t true \n\r ' as boolean)
-- !query schema
struct<CAST( true
-
- AS BOOLEAN):boolean>
+ AS BOOLEAN):boolean>
-- !query output
true
@@ -499,8 +498,7 @@ true
select cast('\t\n false \t\r' as boolean)
-- !query schema
struct<CAST(
- false
- AS BOOLEAN):boolean>
+ false AS BOOLEAN):boolean>
-- !query output
false
@@ -509,8 +507,7 @@ false
select cast('\t\n xyz \t\r' as boolean)
-- !query schema
struct<CAST(
- xyz
- AS BOOLEAN):boolean>
+ xyz AS BOOLEAN):boolean>
-- !query output
NULL
@@ -1131,8 +1128,7 @@ struct<CAST(1.0 AS DECIMAL(10,0)):decimal(10,0)>
select '\t\t true \n\r ' :: boolean
-- !query schema
struct<CAST( true
-
- AS BOOLEAN):boolean>
+ AS BOOLEAN):boolean>
-- !query output
true
diff --git
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/nonansi/literals.sql.out
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/nonansi/literals.sql.out
index 29b93893b5..410b55bdd4 100644
---
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/nonansi/literals.sql.out
+++
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/nonansi/literals.sql.out
@@ -360,12 +360,10 @@ pattern% no-pattern\% pattern\% pattern\\%
select '\'', '"', '\n', '\r', '\t', 'Z'
-- !query schema
struct<':string,":string,
-:string,
-:string, :string,Z:string>
+:string, :string, :string,Z:string>
-- !query output
' "
-
- Z
+ Z
-- !query
diff --git
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/type-coercion-edge-cases.sql.out
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/type-coercion-edge-cases.sql.out
index da0ceafa89..d889a89160 100644
---
a/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/type-coercion-edge-cases.sql.out
+++
b/gluten-ut/spark41/src/test/resources/backends-velox/sql-tests/results/type-coercion-edge-cases.sql.out
@@ -18,26 +18,9 @@ NULL
-- !query
SELECT col2.field FROM t1
-- !query schema
-struct<>
+struct<field:double>
-- !query output
-org.apache.spark.SparkNumberFormatException
-{
- "errorClass" : "CAST_INVALID_INPUT",
- "sqlState" : "22018",
- "messageParameters" : {
- "ansiConfig" : "\"spark.sql.ansi.enabled\"",
- "expression" : "'field'",
- "sourceType" : "\"STRING\"",
- "targetType" : "\"BIGINT\""
- },
- "queryContext" : [ {
- "objectType" : "",
- "objectName" : "",
- "startIndex" : 8,
- "stopIndex" : 17,
- "fragment" : "col2.field"
- } ]
-}
+
-- !query
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
index 49a0da2939..7eef6d245a 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
@@ -38,7 +38,7 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings
{
val SUPPORTED_SQL_QUERY_LIST: Set[String] = Set(
"ansi/conditional-functions.sql",
"ansi/decimalArithmeticOperations.sql",
- // TODO: fix on Spark-4.1 "cast.sql",
+ "cast.sql",
"change-column.sql",
"ceil-floor-with-scale-param.sql",
"column-resolution-aggregate.sql",
@@ -90,7 +90,7 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings
{
"like-all.sql",
"like-any.sql",
// "limit.sql",
- // TODO: fix on Spark-4.1 "literals.sql",
+ "literals.sql",
"map.sql",
"mask-functions.sql",
"math.sql",
@@ -235,7 +235,7 @@ object VeloxSQLQueryTestSettings extends
SQLQueryTestSettings {
// "timestampNTZ/timestamp-ansi.sql",
// "timestampNTZ/timestamp.sql",
// "nonansi/array.sql",
- // TODO: fix on Spark-4.1 "nonansi/cast.sql",
+ "nonansi/cast.sql",
"nonansi/conditional-functions.sql",
// "nonansi/date.sql",
// "nonansi/datetime-parsing-invalid.sql",
@@ -245,7 +245,7 @@ object VeloxSQLQueryTestSettings extends
SQLQueryTestSettings {
"nonansi/higher-order-functions.sql",
// "nonansi/interval.sql",
"nonansi/keywords.sql",
- // TODO: fix on Spark-4.1 "nonansi/literals.sql",
+ "nonansi/literals.sql",
"nonansi/map.sql",
"nonansi/math.sql",
"nonansi/parse-schema-string.sql",
@@ -281,7 +281,7 @@ object VeloxSQLQueryTestSettings extends
SQLQueryTestSettings {
"subquery/resolution-edge-cases.sql",
"thetasketch.sql",
"time.sql",
- // TODO: fix on Spark-4.1 "type-coercion-edge-cases.sql",
+ "type-coercion-edge-cases.sql",
"union-per-child-output-deduplication.sql",
"union-resolution-edge-cases.sql",
// TODO: fix on Spark-4.1 "variant-field-extractions.sql",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
