This is an automated email from the ASF dual-hosted git repository.
rui-mo 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 c6852ecd3f [GLUTEN-13177][VL] Refresh the Spark 4.2 SQLQueryTest
golden files: identifier-clause, identifier-clause-legacy (#13294)
c6852ecd3f is described below
commit c6852ecd3f8dcaea57752559a5645f593fdf4a1e
Author: Akshay Tayal <[email protected]>
AuthorDate: Fri Oct 23 10:04:25 2026 -0700
[GLUTEN-13177][VL] Refresh the Spark 4.2 SQLQueryTest golden files:
identifier-clause, identifier-clause-legacy (#13294)
---
.../results/identifier-clause-legacy.sql.out | 64 +++++++++++++---------
.../sql-tests/results/identifier-clause.sql.out | 52 ++++++++++--------
.../utils/velox/VeloxSQLQueryTestSettings.scala | 2 +
3 files changed, 70 insertions(+), 48 deletions(-)
diff --git
a/gluten-ut/spark42/src/test/resources/backends-velox/sql-tests/results/identifier-clause-legacy.sql.out
b/gluten-ut/spark42/src/test/resources/backends-velox/sql-tests/results/identifier-clause-legacy.sql.out
index 6a99be0570..53a5971301 100644
---
a/gluten-ut/spark42/src/test/resources/backends-velox/sql-tests/results/identifier-clause-legacy.sql.out
+++
b/gluten-ut/spark42/src/test/resources/backends-velox/sql-tests/results/identifier-clause-legacy.sql.out
@@ -1011,7 +1011,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`",
+ "identifier" : "`a`.`b`.`c`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1027,7 +1027,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`",
+ "identifier" : "`a`.`b`.`c`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1043,7 +1043,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`",
+ "identifier" : "`a`.`b`.`c`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1059,7 +1059,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`",
+ "identifier" : "`a`.`b`.`c`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1075,7 +1075,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`.`c`",
+ "identifier" : "`a`.`b`.`c`.`d`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1112,11 +1112,11 @@ struct<>
-- !query output
org.apache.spark.sql.AnalysisException
{
- "errorClass" : "IDENTIFIER_TOO_MANY_NAME_PARTS",
- "sqlState" : "42601",
+ "errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
+ "sqlState" : "42K05",
"messageParameters" : {
"identifier" : "`a`.`b`.`c`.`d`",
- "limit" : "2"
+ "sessionCatalog" : "spark_catalog"
},
"queryContext" : [ {
"objectType" : "",
@@ -1135,10 +1135,12 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
- "errorClass" : "INVALID_SQL_SYNTAX.CREATE_TEMP_FUNC_WITH_DATABASE",
- "sqlState" : "42000",
+ "errorClass" : "INVALID_TEMP_OBJ_QUALIFIER",
+ "sqlState" : "42602",
"messageParameters" : {
- "database" : "`default`"
+ "objectName" : "`myDoubleAvg`",
+ "objectType" : "FUNCTION",
+ "qualifier" : "`default`"
},
"queryContext" : [ {
"objectType" : "",
@@ -1157,11 +1159,12 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
- "errorClass" : "INVALID_SQL_SYNTAX.MULTI_PART_NAME",
- "sqlState" : "42000",
+ "errorClass" : "INVALID_TEMP_OBJ_QUALIFIER",
+ "sqlState" : "42602",
"messageParameters" : {
- "name" : "`default`.`myDoubleAvg`",
- "statement" : "DROP TEMPORARY FUNCTION"
+ "objectName" : "`myDoubleAvg`",
+ "objectType" : "FUNCTION",
+ "qualifier" : "`default`"
},
"queryContext" : [ {
"objectType" : "",
@@ -1180,10 +1183,12 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
- "errorClass" : "TEMP_VIEW_NAME_TOO_MANY_NAME_PARTS",
- "sqlState" : "428EK",
+ "errorClass" : "INVALID_TEMP_OBJ_QUALIFIER",
+ "sqlState" : "42602",
"messageParameters" : {
- "actualName" : "`default`.`v`"
+ "objectName" : "`v`",
+ "objectType" : "VIEW",
+ "qualifier" : "`default`"
},
"queryContext" : [ {
"objectType" : "",
@@ -1545,7 +1550,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`v`"
+ "relationName" : "`v`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`default`]"
},
"queryContext" : [ {
"objectType" : "",
@@ -1607,7 +1613,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`tab`"
+ "relationName" : "`tab`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`default`]"
},
"queryContext" : [ {
"objectType" : "",
@@ -1645,7 +1652,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`tab`"
+ "relationName" : "`tab`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`default`]"
},
"queryContext" : [ {
"objectType" : "",
@@ -1683,7 +1691,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`tab`"
+ "relationName" : "`tab`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`default`]"
},
"queryContext" : [ {
"objectType" : "",
@@ -1737,7 +1746,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`tab_renamed`"
+ "relationName" : "`tab_renamed`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`default`]"
},
"queryContext" : [ {
"objectType" : "",
@@ -1875,7 +1885,7 @@ struct<createtab_stmt:string>
-- !query output
CREATE TABLE spark_catalog.identifier_clause_test_schema.test_show (
c1 INT,
- c2 STRING)
+ c2 STRING COLLATE UTF8_BINARY)
USING CSV
@@ -2444,7 +2454,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`test_view`"
+ "relationName" : "`test_view`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`identifier_clause_test_schema`]"
},
"queryContext" : [ {
"objectType" : "EXECUTE IMMEDIATE",
@@ -2466,7 +2477,8 @@
org.apache.spark.sql.catalyst.analysis.NoSuchTableException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" :
"`spark_catalog`.`identifier_clause_test_schema`.`test_view`"
+ "relationName" :
"`spark_catalog`.`identifier_clause_test_schema`.`test_view`",
+ "searchPath" : "[`spark_catalog`.`identifier_clause_test_schema`]"
}
}
diff --git
a/gluten-ut/spark42/src/test/resources/backends-velox/sql-tests/results/identifier-clause.sql.out
b/gluten-ut/spark42/src/test/resources/backends-velox/sql-tests/results/identifier-clause.sql.out
index 0c04737912..6537797d92 100644
---
a/gluten-ut/spark42/src/test/resources/backends-velox/sql-tests/results/identifier-clause.sql.out
+++
b/gluten-ut/spark42/src/test/resources/backends-velox/sql-tests/results/identifier-clause.sql.out
@@ -1011,7 +1011,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`",
+ "identifier" : "`a`.`b`.`c`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1027,7 +1027,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`",
+ "identifier" : "`a`.`b`.`c`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1043,7 +1043,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`",
+ "identifier" : "`a`.`b`.`c`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1059,7 +1059,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`",
+ "identifier" : "`a`.`b`.`c`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1075,7 +1075,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
"sqlState" : "42K05",
"messageParameters" : {
- "namespace" : "`a`.`b`.`c`",
+ "identifier" : "`a`.`b`.`c`.`d`",
"sessionCatalog" : "spark_catalog"
}
}
@@ -1112,11 +1112,11 @@ struct<>
-- !query output
org.apache.spark.sql.AnalysisException
{
- "errorClass" : "IDENTIFIER_TOO_MANY_NAME_PARTS",
- "sqlState" : "42601",
+ "errorClass" : "REQUIRES_SINGLE_PART_NAMESPACE",
+ "sqlState" : "42K05",
"messageParameters" : {
"identifier" : "`a`.`b`.`c`.`d`",
- "limit" : "2"
+ "sessionCatalog" : "spark_catalog"
},
"queryContext" : [ {
"objectType" : "",
@@ -1135,10 +1135,12 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
- "errorClass" : "INVALID_SQL_SYNTAX.CREATE_TEMP_FUNC_WITH_DATABASE",
- "sqlState" : "42000",
+ "errorClass" : "INVALID_TEMP_OBJ_QUALIFIER",
+ "sqlState" : "42602",
"messageParameters" : {
- "database" : "`default`"
+ "objectName" : "`myDoubleAvg`",
+ "objectType" : "FUNCTION",
+ "qualifier" : "`default`"
},
"queryContext" : [ {
"objectType" : "",
@@ -1157,11 +1159,12 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
- "errorClass" : "INVALID_SQL_SYNTAX.MULTI_PART_NAME",
- "sqlState" : "42000",
+ "errorClass" : "INVALID_TEMP_OBJ_QUALIFIER",
+ "sqlState" : "42602",
"messageParameters" : {
- "name" : "`default`.`myDoubleAvg`",
- "statement" : "DROP TEMPORARY FUNCTION"
+ "objectName" : "`myDoubleAvg`",
+ "objectType" : "FUNCTION",
+ "qualifier" : "`default`"
},
"queryContext" : [ {
"objectType" : "",
@@ -1180,10 +1183,12 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
- "errorClass" : "TEMP_VIEW_NAME_TOO_MANY_NAME_PARTS",
- "sqlState" : "428EK",
+ "errorClass" : "INVALID_TEMP_OBJ_QUALIFIER",
+ "sqlState" : "42602",
"messageParameters" : {
- "actualName" : "`default`.`v`"
+ "objectName" : "`v`",
+ "objectType" : "VIEW",
+ "qualifier" : "`default`"
},
"queryContext" : [ {
"objectType" : "",
@@ -1384,7 +1389,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`s`.`tab`"
+ "relationName" : "`s`.`tab`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`default`]"
},
"queryContext" : [ {
"objectType" : "",
@@ -1406,7 +1412,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`s`.`tab`"
+ "relationName" : "`s`.`tab`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`default`]"
},
"queryContext" : [ {
"objectType" : "",
@@ -1428,7 +1435,8 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
"errorClass" : "TABLE_OR_VIEW_NOT_FOUND",
"sqlState" : "42P01",
"messageParameters" : {
- "relationName" : "`s`.`tab`"
+ "relationName" : "`s`.`tab`",
+ "searchPath" : "[`system`.`builtin`, `system`.`session`,
`spark_catalog`.`default`]"
},
"queryContext" : [ {
"objectType" : "",
@@ -1747,7 +1755,7 @@ struct<createtab_stmt:string>
-- !query output
CREATE TABLE spark_catalog.identifier_clause_test_schema.test_show (
c1 INT,
- c2 STRING)
+ c2 STRING COLLATE UTF8_BINARY)
USING CSV
diff --git
a/gluten-ut/spark42/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
b/gluten-ut/spark42/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
index 87752ce9b8..5d7f297e1a 100644
---
a/gluten-ut/spark42/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
+++
b/gluten-ut/spark42/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala
@@ -70,6 +70,7 @@ object VeloxSQLQueryTestSettings extends SQLQueryTestSettings
{
"group-by-ordinal.sql",
"having.sql",
"higher-order-functions.sql",
+ "identifier-clause.sql",
"ignored.sql",
"ilike.sql",
"ilike-all.sql",
@@ -246,6 +247,7 @@ object VeloxSQLQueryTestSettings extends
SQLQueryTestSettings {
"extract-value-resolution-edge-cases.sql",
"generators.sql",
"having-and-order-by-recursive-type-name-resolution.sql",
+ "identifier-clause-legacy.sql",
"join-resolution-edge-cases.sql",
"name-precedence-in-order-by-and-having-with-conflicting-attributes.sql",
// TODO: fix on Spark-4.1 "nonansi/st-functions.sql",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
