This is an automated email from the ASF dual-hosted git repository. maxgekk 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 31b923d50fa [SPARK-40973][SQL] Rename `_LEGACY_ERROR_TEMP_0055` to `UNCLOSED_BRACKETED_COMMENT` 31b923d50fa is described below commit 31b923d50fa6176312f7217069c0055cd778788f Author: itholic <haejoon....@databricks.com> AuthorDate: Tue Nov 8 13:34:27 2022 +0300 [SPARK-40973][SQL] Rename `_LEGACY_ERROR_TEMP_0055` to `UNCLOSED_BRACKETED_COMMENT` ### What changes were proposed in this pull request? This PR proposes to introduce new error class `UNCLOSED_BRACKETED_COMMENT`, by updating the existing legacy temp error class `_LEGACY_ERROR_TEMP_0055 `. ### Why are the changes needed? We should use appropriate error class name that matches the error message. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? The existing CI should pass. Closes #38447 from itholic/LEGACY_0055. Authored-by: itholic <haejoon....@databricks.com> Signed-off-by: Max Gekk <max.g...@gmail.com> --- core/src/main/resources/error/error-classes.json | 10 +++++----- .../org/apache/spark/sql/catalyst/parser/ParseDriver.scala | 5 ++++- .../scala/org/apache/spark/sql/errors/QueryParsingErrors.scala | 10 +++++++--- .../org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala | 4 ++-- sql/core/src/test/resources/sql-tests/results/comments.sql.out | 4 ++-- .../org/apache/spark/sql/execution/SparkSqlParserSuite.scala | 4 ++-- .../org/apache/spark/sql/hive/thriftserver/CliSuite.scala | 3 ++- 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/core/src/main/resources/error/error-classes.json b/core/src/main/resources/error/error-classes.json index 107bf5ebd5a..e28e5208784 100644 --- a/core/src/main/resources/error/error-classes.json +++ b/core/src/main/resources/error/error-classes.json @@ -938,6 +938,11 @@ "Unable to convert SQL type <toType> to Protobuf type <protobufType>." ] }, + "UNCLOSED_BRACKETED_COMMENT" : { + "message" : [ + "Found an unclosed bracketed comment. Please, append */ at the end of the comment." + ] + }, "UNKNOWN_PROTOBUF_MESSAGE_TYPE" : { "message" : [ "Attempting to treat <descriptorName> as a Message, but it was <containingType>" @@ -1567,11 +1572,6 @@ "It is not allowed to add database prefix `<database>` for the TEMPORARY view name." ] }, - "_LEGACY_ERROR_TEMP_0055" : { - "message" : [ - "Unclosed bracketed comment" - ] - }, "_LEGACY_ERROR_TEMP_0056" : { "message" : [ "Invalid time travel spec: <reason>." diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParseDriver.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParseDriver.scala index 10a213373ad..727d35d5c91 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParseDriver.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParseDriver.scala @@ -429,7 +429,10 @@ case class UnclosedCommentProcessor( val failedToken = tokenStream.get(tokenStream.size() - 2) assert(failedToken.getType() == SqlBaseParser.BRACKETED_COMMENT) val position = Origin(Option(failedToken.getLine), Option(failedToken.getCharPositionInLine)) - throw QueryParsingErrors.unclosedBracketedCommentError(command, position) + throw QueryParsingErrors.unclosedBracketedCommentError( + command = command, + start = Origin(Option(failedToken.getStartIndex)), + stop = Origin(Option(failedToken.getStopIndex))) } } 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 1fce265bece..0fcf6edcbdf 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 @@ -601,9 +601,13 @@ private[sql] object QueryParsingErrors extends QueryErrorsBase { ctx) } - def unclosedBracketedCommentError(command: String, position: Origin): Throwable = { - new ParseException(Some(command), "Unclosed bracketed comment", position, position, - Some("_LEGACY_ERROR_TEMP_0055")) + def unclosedBracketedCommentError(command: String, start: Origin, stop: Origin): Throwable = { + new ParseException( + command = Some(command), + start = start, + stop = stop, + errorClass = "UNCLOSED_BRACKETED_COMMENT", + messageParameters = Map.empty) } def invalidTimeTravelSpec(reason: String, ctx: ParserRuleContext): Throwable = { diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala index 3ac4a6571bd..968e2227234 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala @@ -193,7 +193,7 @@ class PlanParserSuite extends AnalysisTest { |""".stripMargin checkError( exception = parseException(query), - errorClass = "_LEGACY_ERROR_TEMP_0055", + errorClass = "UNCLOSED_BRACKETED_COMMENT", parameters = Map.empty) } @@ -211,7 +211,7 @@ class PlanParserSuite extends AnalysisTest { |""".stripMargin checkError( exception = parseException(query), - errorClass = "_LEGACY_ERROR_TEMP_0055", + errorClass = "UNCLOSED_BRACKETED_COMMENT", parameters = Map.empty) } diff --git a/sql/core/src/test/resources/sql-tests/results/comments.sql.out b/sql/core/src/test/resources/sql-tests/results/comments.sql.out index 0f94aacd813..4dc7b4f1860 100644 --- a/sql/core/src/test/resources/sql-tests/results/comments.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/comments.sql.out @@ -133,7 +133,7 @@ struct<> -- !query output org.apache.spark.sql.catalyst.parser.ParseException { - "errorClass" : "_LEGACY_ERROR_TEMP_0055" + "errorClass" : "UNCLOSED_BRACKETED_COMMENT" } @@ -153,5 +153,5 @@ struct<> -- !query output org.apache.spark.sql.catalyst.parser.ParseException { - "errorClass" : "_LEGACY_ERROR_TEMP_0055" + "errorClass" : "UNCLOSED_BRACKETED_COMMENT" } 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 3ffc27b2a2d..57c991c34d9 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 @@ -82,12 +82,12 @@ class SparkSqlParserSuite extends AnalysisTest with SharedSparkSession { checkError( exception = parseException("SET k=`v` /*"), - errorClass = "_LEGACY_ERROR_TEMP_0055", + errorClass = "UNCLOSED_BRACKETED_COMMENT", parameters = Map.empty) checkError( exception = parseException("SET `k`=`v` /*"), - errorClass = "_LEGACY_ERROR_TEMP_0055", + errorClass = "UNCLOSED_BRACKETED_COMMENT", parameters = Map.empty) } diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala index 98a257e60d7..e4e0b9542c4 100644 --- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala +++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala @@ -632,7 +632,8 @@ class CliSuite extends SparkFunSuite { // Unclosed nested bracketed comment. "/* SELECT /*+ HINT() 4; */ SELECT 1;".stripMargin -> "1", // Unclosed comment with query. - "/* Here is a unclosed bracketed comment SELECT 1;"-> "Unclosed bracketed comment", + "/* Here is a unclosed bracketed comment SELECT 1;"-> + "Found an unclosed bracketed comment. Please, append */ at the end of the comment.", // Whole comment. "/* SELECT /*+ HINT() */ 4; */;".stripMargin -> "" ) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org