Skip to content

[SPARK-40792] Helper object to get SQL configs for errors #38242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vitaliili-db wants to merge 1 commit into from
Closed

[SPARK-40792] Helper object to get SQL configs for errors #38242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.internal.StaticSQLConf.GLOBAL_TEMP_DATABASE
import org.apache.spark.sql.streaming.OutputMode
import org.apache.spark.sql.types._
import org.apache.spark.sql.util.SqlConfigKeyUtils
import org.apache.spark.unsafe.array.ByteArrayMethods
import org.apache.spark.unsafe.types.UTF8String
import org.apache.spark.util.CircularBuffer
Expand Down Expand Up @@ -83,7 +84,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
"value" -> toSQLValue(t, from),
"sourceType" -> toSQLType(from),
"targetType" -> toSQLType(to),
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = Array.empty,
summary = "")
}
Expand Down Expand Up @@ -114,7 +115,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
"value" -> value.toPlainString,
"precision" -> decimalPrecision.toString,
"scale" -> decimalScale.toString,
"config" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"config" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand All @@ -130,7 +131,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
"expression" -> toSQLValue(value, from),
"sourceType" -> toSQLType(from),
"targetType" -> toSQLType(to),
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand All @@ -144,7 +145,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
"expression" -> toSQLValue(s, StringType),
"sourceType" -> toSQLType(StringType),
"targetType" -> toSQLType(BooleanType),
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand All @@ -159,7 +160,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
"expression" -> toSQLValue(s, StringType),
"sourceType" -> toSQLType(StringType),
"targetType" -> toSQLType(to),
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand Down Expand Up @@ -222,7 +223,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
def divideByZeroError(context: SQLQueryContext): ArithmeticException = {
new SparkArithmeticException(
errorClass = "DIVIDE_BY_ZERO",
messageParameters = Map("config" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
messageParameters = Map("config" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand All @@ -244,7 +245,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
messageParameters = Map(
"indexValue" -> toSQLValue(index, IntegerType),
"arraySize" -> toSQLValue(numElements, IntegerType),
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand All @@ -258,7 +259,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
messageParameters = Map(
"indexValue" -> toSQLValue(index, IntegerType),
"arraySize" -> toSQLValue(numElements, IntegerType),
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand All @@ -267,7 +268,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
new SparkDateTimeException(
errorClass = "INVALID_FRACTION_OF_SECOND",
messageParameters = Map(
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)
),
context = Array.empty,
summary = "")
Expand All @@ -278,7 +279,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
errorClass = "CANNOT_PARSE_TIMESTAMP",
messageParameters = Map(
"message" -> e.getMessage,
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = Array.empty,
summary = "")
}
Expand All @@ -288,7 +289,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
errorClass = "_LEGACY_ERROR_TEMP_2000",
messageParameters = Map(
"message" -> e.getMessage,
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = Array.empty,
summary = "")
}
Expand All @@ -298,7 +299,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
errorClass = "_LEGACY_ERROR_TEMP_2000",
messageParameters = Map(
"message" -> message,
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)))
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)))
}

def ansiIllegalArgumentError(e: Exception): SparkIllegalArgumentException = {
Expand Down Expand Up @@ -372,7 +373,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
errorClass = "_LEGACY_ERROR_TEMP_2008",
messageParameters = Map(
"url" -> url.toString,
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)))
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)))
}

def illegalUrlError(url: UTF8String): Throwable = {
Expand Down Expand Up @@ -626,7 +627,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
errorClass = "_LEGACY_ERROR_TEMP_2042",
messageParameters = Map(
"message" -> e.getMessage,
"ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = Array.empty,
summary = "")
}
Expand All @@ -643,7 +644,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
messageParameters = Map(
"message" -> message,
"alternative" -> alternative,
"config" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"config" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand Down Expand Up @@ -1261,7 +1262,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
def unscaledValueTooLargeForPrecisionError(): SparkArithmeticException = {
new SparkArithmeticException(
errorClass = "_LEGACY_ERROR_TEMP_2117",
messageParameters = Map("ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
messageParameters = Map("ansiConfig" -> toSQLConf(SqlConfigKeyUtils.ansiModeConfigKey)),
context = Array.empty,
summary = "")
}
Expand Down Expand Up @@ -1376,7 +1377,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
errorClass = "INCONSISTENT_BEHAVIOR_CROSS_VERSION.PARSE_DATETIME_BY_NEW_PARSER",
messageParameters = Map(
"datetime" -> toSQLValue(s, StringType),
"config" -> toSQLConf(SQLConf.LEGACY_TIME_PARSER_POLICY.key)),
"config" -> toSQLConf(SqlConfigKeyUtils.legacyTimeParserPolicyConfigName)),
e)
}

Expand All @@ -1385,7 +1386,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
errorClass = "INCONSISTENT_BEHAVIOR_CROSS_VERSION.DATETIME_PATTERN_RECOGNITION",
messageParameters = Map(
"pattern" -> toSQLValue(pattern, StringType),
"config" -> toSQLConf(SQLConf.LEGACY_TIME_PARSER_POLICY.key)),
"config" -> toSQLConf(SqlConfigKeyUtils.legacyTimeParserPolicyConfigName)),
e)
}

Expand Down
36 changes: 36 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/util/SqlConfigKeyUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.spark.sql.util

import org.apache.spark.sql.internal.SQLConf

object SqlConfigKeyUtils {
def ansiModeConfigKey: String = getSqlConfigKey(SQLConf.ANSI_ENABLED.key)
def legacyTimeParserPolicyConfigName: String =
getSqlConfigKey(SQLConf.LEGACY_TIME_PARSER_POLICY.key)

/**
* Used to find a SQL configuration.
*
* @param sparkConfigKey Spark configuration key
* @return Returns the SQL configuration key.
*/
def getSqlConfigKey(sparkConfigKey: String): String = {
sparkConfigKey
}
}