You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2023/02/12 14:13:35 UTC
[spark] branch branch-3.4 updated: [SPARK-42312][SQL] Assign name to _LEGACY_ERROR_TEMP_0042
This is an automated email from the ASF dual-hosted git repository.
maxgekk pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 2729e12d3ed [SPARK-42312][SQL] Assign name to _LEGACY_ERROR_TEMP_0042
2729e12d3ed is described below
commit 2729e12d3ed0e0513da7fcb2a4c6bdc78aa955ac
Author: itholic <ha...@databricks.com>
AuthorDate: Sun Feb 12 19:13:05 2023 +0500
[SPARK-42312][SQL] Assign name to _LEGACY_ERROR_TEMP_0042
### What changes were proposed in this pull request?
This PR proposes to assign name to _LEGACY_ERROR_TEMP_0042, "INVALID_SET_SYNTAX".
### Why are the changes needed?
We should assign proper name to _LEGACY_ERROR_TEMP_*
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
`./build/sbt "sql/testOnly org.apache.spark.sql.SQLQueryTestSuite*`
Closes #39951 from itholic/LEGACY_0042.
Lead-authored-by: itholic <ha...@databricks.com>
Co-authored-by: Haejoon Lee <44...@users.noreply.github.com>
Signed-off-by: Max Gekk <ma...@gmail.com>
(cherry picked from commit 4a27c604eef6f06672a3d2aaa5e40285e15bacab)
Signed-off-by: Max Gekk <ma...@gmail.com>
---
core/src/main/resources/error/error-classes.json | 11 +++++----
.../spark/sql/errors/QueryParsingErrors.scala | 2 +-
.../spark/sql/execution/SparkSqlParserSuite.scala | 28 +++++++++++-----------
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/core/src/main/resources/error/error-classes.json b/core/src/main/resources/error/error-classes.json
index 3082e482392..33f31a97acf 100644
--- a/core/src/main/resources/error/error-classes.json
+++ b/core/src/main/resources/error/error-classes.json
@@ -1004,6 +1004,12 @@
},
"sqlState" : "42K07"
},
+ "INVALID_SET_SYNTAX" : {
+ "message" : [
+ "Expected format is 'SET', 'SET key', or 'SET key=value'. If you want to include special characters in key, or include semicolon in value, please use backquotes, e.g., SET `key`=`value`."
+ ],
+ "sqlState" : "42000"
+ },
"INVALID_SQL_ARG" : {
"message" : [
"The argument <name> of `sql()` is invalid. Consider to replace it by a SQL literal."
@@ -2052,11 +2058,6 @@
"Found duplicate clauses: <clauseName>."
]
},
- "_LEGACY_ERROR_TEMP_0042" : {
- "message" : [
- "Expected format is 'SET', 'SET key', or 'SET key=value'. If you want to include special characters in key, or include semicolon in value, please use quotes, e.g., SET `key`=`value`."
- ]
- },
"_LEGACY_ERROR_TEMP_0043" : {
"message" : [
"Expected format is 'RESET' or 'RESET key'. If you want to include special characters in key, please use quotes, e.g., RESET `key`."
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
index accf5363d6c..57868020736 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
@@ -478,7 +478,7 @@ private[sql] object QueryParsingErrors extends QueryErrorsBase {
}
def unexpectedFormatForSetConfigurationError(ctx: ParserRuleContext): Throwable = {
- new ParseException(errorClass = "_LEGACY_ERROR_TEMP_0042", ctx)
+ new ParseException(errorClass = "INVALID_SET_SYNTAX", ctx)
}
def invalidPropertyKeyForSetQuotedConfigurationError(
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkSqlParserSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkSqlParserSuite.scala
index 57c991c34d9..d6a3b74ee4c 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkSqlParserSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkSqlParserSuite.scala
@@ -119,7 +119,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql1 = "SET spark.sql.key value"
checkError(
exception = parseException(sql1),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql1,
@@ -129,7 +129,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql2 = "SET spark.sql.key 'value'"
checkError(
exception = parseException(sql2),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql2,
@@ -139,7 +139,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql3 = "SET spark.sql.key \"value\" "
checkError(
exception = parseException(sql3),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = "SET spark.sql.key \"value\"",
@@ -149,7 +149,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql4 = "SET spark.sql.key value1 value2"
checkError(
exception = parseException(sql4),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql4,
@@ -159,7 +159,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql5 = "SET spark. sql.key=value"
checkError(
exception = parseException(sql5),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql5,
@@ -169,7 +169,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql6 = "SET spark :sql:key=value"
checkError(
exception = parseException(sql6),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql6,
@@ -179,7 +179,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql7 = "SET spark . sql.key=value"
checkError(
exception = parseException(sql7),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql7,
@@ -189,7 +189,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql8 = "SET spark.sql. key=value"
checkError(
exception = parseException(sql8),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql8,
@@ -199,7 +199,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql9 = "SET spark.sql :key=value"
checkError(
exception = parseException(sql9),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql9,
@@ -209,7 +209,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql10 = "SET spark.sql . key=value"
checkError(
exception = parseException(sql10),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql10,
@@ -219,7 +219,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql11 = "SET ="
checkError(
exception = parseException(sql11),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql11,
@@ -229,7 +229,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql12 = "SET =value"
checkError(
exception = parseException(sql12),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql12,
@@ -353,7 +353,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql1 = "SET a=1; SELECT 1"
checkError(
exception = parseException(sql1),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = sql1,
@@ -363,7 +363,7 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession {
val sql2 = "SET a=1;2;;"
checkError(
exception = parseException(sql2),
- errorClass = "_LEGACY_ERROR_TEMP_0042",
+ errorClass = "INVALID_SET_SYNTAX",
parameters = Map.empty,
context = ExpectedContext(
fragment = "SET a=1;2",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org