This is an automated email from the ASF dual-hosted git repository.
gengliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 59f88c372522 [SPARK-48294][SQL] Handle lowercase in
nestedTypeMissingElementTypeError
59f88c372522 is described below
commit 59f88c3725222b84b2d0b51ba40a769d99866b56
Author: Michael Zhang <m.zh...@databricks.com>
AuthorDate: Thu May 16 14:58:25 2024 -0700
[SPARK-48294][SQL] Handle lowercase in nestedTypeMissingElementTypeError
### What changes were proposed in this pull request?
Handle lowercase values inside of nestTypeMissingElementTypeError to
prevent match errors.
### Why are the changes needed?
The previous match error was not user-friendly. Now it gives an actionable
`INCOMPLETE_TYPE_DEFINITION` error.
### Does this PR introduce _any_ user-facing change?
N/A
### How was this patch tested?
Newly added tests pass.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #46623 from michaelzhan-db/SPARK-48294.
Authored-by: Michael Zhang <m.zh...@databricks.com>
Signed-off-by: Gengliang Wang <gengli...@apache.org>
---
.../apache/spark/sql/errors/QueryParsingErrors.scala | 2 +-
.../spark/sql/errors/QueryParsingErrorsSuite.scala | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git
a/sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
b/sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
index 5eafd4d915a4..816fa546a138 100644
---
a/sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
+++
b/sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
@@ -289,7 +289,7 @@ private[sql] object QueryParsingErrors extends
DataTypeErrorsBase {
def nestedTypeMissingElementTypeError(
dataType: String, ctx: PrimitiveDataTypeContext): Throwable = {
- dataType match {
+ dataType.toUpperCase(Locale.ROOT) match {
case "ARRAY" =>
new ParseException(
errorClass = "INCOMPLETE_TYPE_DEFINITION.ARRAY",
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
index 29ab6e994e42..b7fb65091ef7 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
@@ -647,6 +647,13 @@ class QueryParsingErrorsSuite extends QueryTest with
SharedSparkSession with SQL
sqlState = "42K01",
parameters = Map("elementType" -> "<INT>"),
context = ExpectedContext(fragment = "ARRAY", start = 30, stop = 34))
+ // Create column of array type without specifying element type in lowercase
+ checkError(
+ exception = parseException("CREATE TABLE tbl_120691 (col1 array)"),
+ errorClass = "INCOMPLETE_TYPE_DEFINITION.ARRAY",
+ sqlState = "42K01",
+ parameters = Map("elementType" -> "<INT>"),
+ context = ExpectedContext(fragment = "array", start = 30, stop = 34))
}
test("INCOMPLETE_TYPE_DEFINITION: struct type definition is incomplete") {
@@ -674,6 +681,12 @@ class QueryParsingErrorsSuite extends QueryTest with
SharedSparkSession with SQL
errorClass = "PARSE_SYNTAX_ERROR",
sqlState = "42601",
parameters = Map("error" -> "'<'", "hint" -> ": missing ')'"))
+ // Create column of struct type without specifying field type in lowercase
+ checkError(
+ exception = parseException("CREATE TABLE tbl_120691 (col1 struct)"),
+ errorClass = "INCOMPLETE_TYPE_DEFINITION.STRUCT",
+ sqlState = "42K01",
+ context = ExpectedContext(fragment = "struct", start = 30, stop = 35))
}
test("INCOMPLETE_TYPE_DEFINITION: map type definition is incomplete") {
@@ -695,6 +708,12 @@ class QueryParsingErrorsSuite extends QueryTest with
SharedSparkSession with SQL
errorClass = "PARSE_SYNTAX_ERROR",
sqlState = "42601",
parameters = Map("error" -> "'<'", "hint" -> ": missing ')'"))
+ // Create column of map type without specifying key/value types in
lowercase
+ checkError(
+ exception = parseException("SELECT CAST(map('1',2) AS map)"),
+ errorClass = "INCOMPLETE_TYPE_DEFINITION.MAP",
+ sqlState = "42K01",
+ context = ExpectedContext(fragment = "map", start = 26, stop = 28))
}
test("INVALID_ESC: Escape string must contain only one character") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
