From 1f21641e0890c9f0586116ba685dceeee882f3f8 Mon Sep 17 00:00:00 2001 From: xuyu <11161569@vivo.com> Date: Tue, 13 Aug 2024 17:47:29 +0800 Subject: [PATCH 1/5] [SPARK-49222][SQL] Clear useless methods in QueryCompilationErrors --- .../sql/errors/QueryCompilationErrors.scala | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala index c422b32c5ec20..27d8cbc5214f5 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala @@ -203,13 +203,6 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat invalidParameter("DOUBLE", "ewm", "alpha", invalidValue) } - def invalidStringParameter( - functionName: String, - parameter: String, - invalidValue: Expression): Throwable = { - invalidParameter("STRING", functionName, parameter, invalidValue) - } - def invalidParameter( subClass: String, functionName: String, @@ -1679,12 +1672,6 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat messageParameters = Map.empty) } - def cannotSaveVariantIntoExternalStorageError(): Throwable = { - new AnalysisException( - errorClass = "CANNOT_SAVE_VARIANT", - messageParameters = Map.empty) - } - def cannotResolveAttributeError(name: String, outputStr: String): Throwable = { new AnalysisException( errorClass = "_LEGACY_ERROR_TEMP_1137", @@ -3731,13 +3718,6 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat ) } - def indeterminateCollationError(): Throwable = { - new AnalysisException( - errorClass = "INDETERMINATE_COLLATION", - messageParameters = Map.empty - ) - } - def cannotConvertProtobufTypeToSqlTypeError( protobufColumn: String, sqlColumn: Seq[String], From 96bc9ccc4ff7496f0f5ad77f2b1bcbec219ffa45 Mon Sep 17 00:00:00 2001 From: xuyu <11161569@vivo.com> Date: Tue, 13 Aug 2024 20:20:19 +0800 Subject: [PATCH 2/5] remove var --- common/utils/src/main/resources/error/error-conditions.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/utils/src/main/resources/error/error-conditions.json b/common/utils/src/main/resources/error/error-conditions.json index 9947d9609cb6a..ca37908a3f2ce 100644 --- a/common/utils/src/main/resources/error/error-conditions.json +++ b/common/utils/src/main/resources/error/error-conditions.json @@ -388,12 +388,6 @@ ], "sqlState" : "58030" }, - "CANNOT_SAVE_VARIANT" : { - "message" : [ - "Cannot save variant data type into external storage." - ], - "sqlState" : "0A000" - }, "CANNOT_UPDATE_FIELD" : { "message" : [ "Cannot update field type:" From 59d7d9aa19c0a2adb8af9d9a8efd3c2653c05691 Mon Sep 17 00:00:00 2001 From: xuyu <11161569@vivo.com> Date: Tue, 13 Aug 2024 20:43:20 +0800 Subject: [PATCH 3/5] fix --- common/utils/src/main/resources/error/error-conditions.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/utils/src/main/resources/error/error-conditions.json b/common/utils/src/main/resources/error/error-conditions.json index ca37908a3f2ce..a5d02f41548ad 100644 --- a/common/utils/src/main/resources/error/error-conditions.json +++ b/common/utils/src/main/resources/error/error-conditions.json @@ -1743,12 +1743,6 @@ ], "sqlState" : "22003" }, - "INDETERMINATE_COLLATION" : { - "message" : [ - "Function called requires knowledge of the collation it should apply, but indeterminate collation was found. Use COLLATE function to set the collation explicitly." - ], - "sqlState" : "42P22" - }, "INDEX_ALREADY_EXISTS" : { "message" : [ "Cannot create the index on table because it already exists." From 6d800e9dd48c64165a2377ed956f808cdc75f663 Mon Sep 17 00:00:00 2001 From: xuyu <11161569@vivo.com> Date: Wed, 14 Aug 2024 16:18:28 +0800 Subject: [PATCH 4/5] recovery --- .../utils/src/main/resources/error/error-conditions.json | 6 ++++++ .../apache/spark/sql/errors/QueryCompilationErrors.scala | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/common/utils/src/main/resources/error/error-conditions.json b/common/utils/src/main/resources/error/error-conditions.json index a5d02f41548ad..ca37908a3f2ce 100644 --- a/common/utils/src/main/resources/error/error-conditions.json +++ b/common/utils/src/main/resources/error/error-conditions.json @@ -1743,6 +1743,12 @@ ], "sqlState" : "22003" }, + "INDETERMINATE_COLLATION" : { + "message" : [ + "Function called requires knowledge of the collation it should apply, but indeterminate collation was found. Use COLLATE function to set the collation explicitly." + ], + "sqlState" : "42P22" + }, "INDEX_ALREADY_EXISTS" : { "message" : [ "Cannot create the index on table because it already exists." diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala index 27d8cbc5214f5..4d99534670c4e 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala @@ -1678,6 +1678,13 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat messageParameters = Map("name" -> name, "outputStr" -> outputStr)) } + def indeterminateCollationError(): Throwable = { + new AnalysisException( + errorClass = "INDETERMINATE_COLLATION", + messageParameters = Map.empty + ) + } + def orcNotUsedWithHiveEnabledError(): Throwable = { new AnalysisException( errorClass = "_LEGACY_ERROR_TEMP_1138", From 1f6e7c66009ac0e69d333f572cd81f27f6dd979e Mon Sep 17 00:00:00 2001 From: xuyu <11161569@vivo.com> Date: Wed, 14 Aug 2024 16:21:11 +0800 Subject: [PATCH 5/5] recovery --- .../spark/sql/errors/QueryCompilationErrors.scala | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala index 4d99534670c4e..5dc7a5a7821de 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala @@ -1678,13 +1678,6 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat messageParameters = Map("name" -> name, "outputStr" -> outputStr)) } - def indeterminateCollationError(): Throwable = { - new AnalysisException( - errorClass = "INDETERMINATE_COLLATION", - messageParameters = Map.empty - ) - } - def orcNotUsedWithHiveEnabledError(): Throwable = { new AnalysisException( errorClass = "_LEGACY_ERROR_TEMP_1138", @@ -3725,6 +3718,13 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat ) } + def indeterminateCollationError(): Throwable = { + new AnalysisException( + errorClass = "INDETERMINATE_COLLATION", + messageParameters = Map.empty + ) + } + def cannotConvertProtobufTypeToSqlTypeError( protobufColumn: String, sqlColumn: Seq[String],