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 c7ea3f7d53d [SPARK-43251][SQL] Replace the error class `_LEGACY_ERROR_TEMP_2015` with an internal error c7ea3f7d53d is described below commit c7ea3f7d53d5a7674f3da0db07018c1f0c43dbf6 Author: dengziming <dengzim...@bytedance.com> AuthorDate: Mon Sep 11 18:28:31 2023 +0300 [SPARK-43251][SQL] Replace the error class `_LEGACY_ERROR_TEMP_2015` with an internal error ### What changes were proposed in this pull request? Replace the legacy error class `_LEGACY_ERROR_TEMP_2015` with an internal error as it is not triggered by the user space. ### Why are the changes needed? As the error is not triggered by the user space, the legacy error class can be replaced by an internal error. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing test cases. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #42845 from dengziming/SPARK-43251. Authored-by: dengziming <dengzim...@bytedance.com> Signed-off-by: Max Gekk <max.g...@gmail.com> --- common/utils/src/main/resources/error/error-classes.json | 5 ----- .../scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala | 9 +++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/common/utils/src/main/resources/error/error-classes.json b/common/utils/src/main/resources/error/error-classes.json index 2954d8b9338..282af8c199d 100644 --- a/common/utils/src/main/resources/error/error-classes.json +++ b/common/utils/src/main/resources/error/error-classes.json @@ -4944,11 +4944,6 @@ "Negative values found in <frequencyExpression>" ] }, - "_LEGACY_ERROR_TEMP_2015" : { - "message" : [ - "Cannot generate <codeType> code for incomparable type: <dataType>." - ] - }, "_LEGACY_ERROR_TEMP_2016" : { "message" : [ "Can not interpolate <arg> into code block." diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala index 2d655be0e70..417ba38c66f 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala @@ -405,12 +405,9 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE } def cannotGenerateCodeForIncomparableTypeError( - codeType: String, dataType: DataType): SparkIllegalArgumentException = { - new SparkIllegalArgumentException( - errorClass = "_LEGACY_ERROR_TEMP_2015", - messageParameters = Map( - "codeType" -> codeType, - "dataType" -> dataType.catalogString)) + codeType: String, dataType: DataType): Throwable = { + SparkException.internalError( + s"Cannot generate $codeType code for incomparable type: ${toSQLType(dataType)}.") } def cannotInterpolateClassIntoCodeBlockError(arg: Any): SparkIllegalArgumentException = { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org