[SPARK-39229][SQL] Separate query contexts from error-classes.json #36604
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,8 +84,12 @@ private[spark] class SparkUpgradeException( | |
| /** | ||
| * Arithmetic exception thrown from Spark with an error class. | ||
| */ | ||
| private[spark] class SparkArithmeticException( | ||
| errorClass: String, | ||
| messageParameters: Array[String], | ||
| queryContext: String = "") | ||
| extends ArithmeticException( | ||
| SparkThrowableHelper.getMessage(errorClass, messageParameters, queryContext)) | ||
| with SparkThrowable { | ||
|
|
||
| override def getErrorClass: String = errorClass | ||
|
|
@@ -132,9 +136,13 @@ private[spark] class SparkConcurrentModificationException( | |
| /** | ||
| * Datetime exception thrown from Spark with an error class. | ||
| */ | ||
| private[spark] class SparkDateTimeException( | ||
| errorClass: String, | ||
| messageParameters: Array[String], | ||
| queryContext: String = "") | ||
| extends DateTimeException( | ||
| SparkThrowableHelper.getMessage(errorClass, messageParameters, queryContext)) | ||
| with SparkThrowable { | ||
|
|
||
| override def getErrorClass: String = errorClass | ||
| } | ||
|
|
@@ -168,9 +176,11 @@ private[spark] class SparkFileNotFoundException( | |
| */ | ||
| private[spark] class SparkNumberFormatException( | ||
| errorClass: String, | ||
| messageParameters: Array[String], | ||
| queryContext: String) | ||
| extends NumberFormatException( | ||
| SparkThrowableHelper.getMessage(errorClass, messageParameters, queryContext)) | ||
| with SparkThrowable { | ||
|
|
||
| override def getErrorClass: String = errorClass | ||
| } | ||
|
|
@@ -226,9 +236,11 @@ private[spark] class SparkIOException( | |
| private[spark] class SparkRuntimeException( | ||
| errorClass: String, | ||
| messageParameters: Array[String], | ||
| cause: Throwable = null, | ||
| queryContext: String = "") | ||
| extends RuntimeException( | ||
| SparkThrowableHelper.getMessage(errorClass, messageParameters, queryContext), cause) | ||
| with SparkThrowable { | ||
|
|
||
| override def getErrorClass: String = errorClass | ||
| } | ||
|
|
@@ -274,9 +286,11 @@ private[spark] class SparkSQLException( | |
| */ | ||
| private[spark] class SparkNoSuchElementException( | ||
| errorClass: String, | ||
| messageParameters: Array[String], | ||
| queryContext: String) | ||
| extends NoSuchElementException( | ||
| SparkThrowableHelper.getMessage(errorClass, messageParameters, queryContext)) | ||
| with SparkThrowable { | ||
|
|
||
| override def getErrorClass: String = errorClass | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,7 +127,7 @@ class SparkThrowableSuite extends SparkFunSuite { | |
| assert(getMessage("DIVIDE_BY_ZERO", Array("foo", "bar", "baz")) == | ||
| "[DIVIDE_BY_ZERO] Division by zero. " + | ||
| "To return NULL instead, use `try_divide`. If necessary set foo to \"false\" " + | ||
| "(except for ANSI interval type) to bypass this error.") | ||
| } | ||
|
|
||
| test("Error message is formatted") { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -104,8 +104,8 @@ object QueryExecutionErrors extends QueryErrorsBase { | |
| value.toDebugString, | ||
| decimalPrecision.toString, | ||
| decimalScale.toString, | ||
| toSQLConf(SQLConf.ANSI_ENABLED.key)), | ||
| queryContext = context) | ||
| } | ||
|
|
||
| def invalidInputInCastToDatetimeError( | ||
|
|
@@ -119,8 +119,8 @@ object QueryExecutionErrors extends QueryErrorsBase { | |
| toSQLValue(value, from), | ||
| toSQLType(from), | ||
| toSQLType(to), | ||
| toSQLConf(SQLConf.ANSI_ENABLED.key)), | ||
| queryContext = errorContext) | ||
| } | ||
|
|
||
| def invalidInputSyntaxForBooleanError( | ||
|
|
@@ -132,8 +132,8 @@ object QueryExecutionErrors extends QueryErrorsBase { | |
| toSQLValue(s, StringType), | ||
| toSQLType(StringType), | ||
| toSQLType(BooleanType), | ||
| toSQLConf(SQLConf.ANSI_ENABLED.key)), | ||
| queryContext = errorContext) | ||
| } | ||
|
|
||
| def invalidInputInCastToNumberError( | ||
|
|
@@ -146,8 +146,8 @@ object QueryExecutionErrors extends QueryErrorsBase { | |
| toSQLValue(s, StringType), | ||
| toSQLType(StringType), | ||
| toSQLType(to), | ||
| toSQLConf(SQLConf.ANSI_ENABLED.key)), | ||
| queryContext = errorContext) | ||
| } | ||
|
|
||
| def cannotCastFromNullTypeError(to: DataType): Throwable = { | ||
|
|
@@ -180,7 +180,8 @@ object QueryExecutionErrors extends QueryErrorsBase { | |
| def divideByZeroError(context: String): ArithmeticException = { | ||
| new SparkArithmeticException( | ||
| errorClass = "DIVIDE_BY_ZERO", | ||
| messageParameters = Array(toSQLConf(SQLConf.ANSI_ENABLED.key)), | ||
| queryContext = context) | ||
| } | ||
|
|
||
| def invalidArrayIndexError(index: Int, numElements: Int): ArrayIndexOutOfBoundsException = { | ||
|
|
@@ -218,8 +219,8 @@ object QueryExecutionErrors extends QueryErrorsBase { | |
| errorClass = "MAP_KEY_DOES_NOT_EXIST", | ||
| messageParameters = Array( | ||
| toSQLValue(key, dataType), | ||
| toSQLConf(SQLConf.ANSI_ENABLED.key)), | ||
| queryContext = context) | ||
| } | ||
|
|
||
| def invalidFractionOfSecondError(): DateTimeException = { | ||
|
|
@@ -477,8 +478,10 @@ object QueryExecutionErrors extends QueryErrorsBase { | |
| hint: String = "", | ||
| errorContext: String = ""): ArithmeticException = { | ||
| val alternative = if (hint.nonEmpty) s" To return NULL instead, use '$hint'." else "" | ||
| new SparkArithmeticException( | ||
| errorClass = "ARITHMETIC_OVERFLOW", | ||
| messageParameters = Array(message, alternative, SQLConf.ANSI_ENABLED.key), | ||
| queryContext = errorContext) | ||
| } | ||
|
|
||
| def unaryMinusCauseOverflowError(originValue: Int): ArithmeticException = { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know it's causing diffs, but we really should have a space.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, there is a "\n" at the beginning of
queryContext.Probably I should move it from
queryContextto the method here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried moving the "\n" out of the query context. It requires updates on the starting and ending position of "^^^^^^" too. I will do it in another PR to make this one clean.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Opened #36612 for this.