Skip to content

[SPARK-51817][SPARK-49578][CONNECT] Re-introduce ansiConfig fields in messageParameters of CAST_INVALID_INPUT and CAST_OVERFLOW #50604

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
nija-at wants to merge 5 commits into from
Closed

[SPARK-51817][SPARK-49578][CONNECT] Re-introduce ansiConfig fields in messageParameters of CAST_INVALID_INPUT and CAST_OVERFLOW #50604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2911d5f
partial revert
nija-at Apr 16, 2025
ddf66ca
fix tests
nija-at Apr 23, 2025
1e45fef
fixes and lints
nija-at Apr 23, 2025
55b4a2c
fix tests
nija-at Apr 24, 2025
d2aada5
fix more tests
nija-at Apr 25, 2025
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
5 changes: 4 additions & 1 deletion common/utils/src/main/scala/org/apache/spark/ErrorClassesJSONReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ class ErrorClassesJsonReader(jsonFileURLs: Seq[URL]) {
}
if (util.SparkEnvUtils.isTesting) {
val placeHoldersNum = ErrorClassesJsonReader.TEMPLATE_REGEX.findAllIn(messageTemplate).length
if (placeHoldersNum < sanitizedParameters.size) {
if (placeHoldersNum < sanitizedParameters.size &&
!ErrorClassesJsonReader.MORE_PARAMS_ALLOWLIST.contains(errorClass)) {
throw SparkException.internalError(
s"Found unused message parameters of the error class '$errorClass'. " +
s"Its error message format has $placeHoldersNum placeholders, " +
Expand Down Expand Up @@ -123,6 +124,8 @@ class ErrorClassesJsonReader(jsonFileURLs: Seq[URL]) {
private object ErrorClassesJsonReader {
private val TEMPLATE_REGEX = "<([a-zA-Z0-9_-]+)>".r

private val MORE_PARAMS_ALLOWLIST = Array("CAST_INVALID_INPUT", "CAST_OVERFLOW")

private val mapper: JsonMapper = JsonMapper.builder()
.addModule(DefaultScalaModule)
.build()
Expand Down
10 changes: 7 additions & 3 deletions sql/api/src/main/scala/org/apache/spark/sql/errors/DataTypeErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ private[sql] object DataTypeErrors extends DataTypeErrorsBase {
messageParameters = Map(
"expression" -> convertedValueStr,
"sourceType" -> toSQLType(StringType),
"targetType" -> toSQLType(to)),
"targetType" -> toSQLType(to),
"ansiConfig" -> toSQLConf("spark.sql.ansi.enabled")),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand All @@ -225,8 +226,11 @@ private[sql] object DataTypeErrors extends DataTypeErrorsBase {
def castingCauseOverflowError(t: String, from: DataType, to: DataType): ArithmeticException = {
new SparkArithmeticException(
errorClass = "CAST_OVERFLOW",
messageParameters =
Map("value" -> t, "sourceType" -> toSQLType(from), "targetType" -> toSQLType(to)),
messageParameters = Map(
"value" -> t,
"sourceType" -> toSQLType(from),
"targetType" -> toSQLType(to),
"ansiConfig" -> toSQLConf("spark.sql.ansi.enabled")),
context = Array.empty,
summary = "")
}
Expand Down
3 changes: 2 additions & 1 deletion sql/api/src/main/scala/org/apache/spark/sql/errors/ExecutionErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ private[sql] trait ExecutionErrors extends DataTypeErrorsBase {
messageParameters = Map(
"expression" -> sqlValue,
"sourceType" -> toSQLType(from),
"targetType" -> toSQLType(to)),
"targetType" -> toSQLType(to),
"ansiConfig" -> toSQLConf("spark.sql.ansi.enabled")),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand Down
9 changes: 6 additions & 3 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 @@ -79,7 +79,8 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE
messageParameters = Map(
"value" -> toSQLValue(t, from),
"sourceType" -> toSQLType(from),
"targetType" -> toSQLType(to)),
"targetType" -> toSQLType(to),
"ansiConfig" -> toSQLConf("spark.sql.ansi.enabled")),
context = Array.empty,
summary = "")
}
Expand Down Expand Up @@ -123,7 +124,8 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE
messageParameters = Map(
"expression" -> toSQLValue(s, StringType),
"sourceType" -> toSQLType(StringType),
"targetType" -> toSQLType(BooleanType)),
"targetType" -> toSQLType(BooleanType),
"ansiConfig" -> toSQLConf("spark.sql.ansi.enabled")),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand All @@ -137,7 +139,8 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE
messageParameters = Map(
"expression" -> toSQLValue(s, StringType),
"sourceType" -> toSQLType(StringType),
"targetType" -> toSQLType(to)),
"targetType" -> toSQLType(to),
"ansiConfig" -> toSQLConf("spark.sql.ansi.enabled")),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand Down
3 changes: 2 additions & 1 deletion sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,8 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers with SQLHelper {
parameters = Map(
"expression" -> s"'$invalidTime'",
"sourceType" -> "\"STRING\"",
"targetType" -> "\"TIME(6)\""))
"targetType" -> "\"TIME(6)\"",
"ansiConfig" -> "\"spark.sql.ansi.enabled\""))
}
}
}
3 changes: 2 additions & 1 deletion sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/TimeFormatterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ class TimeFormatterSuite extends SparkFunSuite with SQLHelper {
parameters = Map(
"expression" -> "'x123'",
"sourceType" -> "\"STRING\"",
"targetType" -> "\"TIME(6)\""))
"targetType" -> "\"TIME(6)\"",
"ansiConfig" -> "\"spark.sql.ansi.enabled\""))
}
}
3 changes: 2 additions & 1 deletion sql/catalyst/src/test/scala/org/apache/spark/sql/types/DecimalSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,8 @@ class DecimalSuite extends SparkFunSuite with PrivateMethodTester with SQLHelper
parameters = Map(
"expression" -> "'str'",
"sourceType" -> "\"STRING\"",
"targetType" -> "\"DECIMAL(10,0)\""))
"targetType" -> "\"DECIMAL(10,0)\"",
"ansiConfig" -> "\"spark.sql.ansi.enabled\""))
}

test("SPARK-35841: Casting string to decimal type doesn't work " +
Expand Down
2 changes: 2 additions & 0 deletions sql/core/src/test/resources/sql-tests/analyzer-results/execute-immediate.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ org.apache.spark.SparkNumberFormatException
"errorClass" : "CAST_INVALID_INPUT",
"sqlState" : "22018",
"messageParameters" : {
"ansiConfig" : "\"spark.sql.ansi.enabled\"",
"expression" : "'invalid_cast_error_expected'",
"sourceType" : "\"STRING\"",
"targetType" : "\"INT\""
Expand Down Expand Up @@ -661,6 +662,7 @@ org.apache.spark.SparkNumberFormatException
"errorClass" : "CAST_INVALID_INPUT",
"sqlState" : "22018",
"messageParameters" : {
"ansiConfig" : "\"spark.sql.ansi.enabled\"",
"expression" : "'name1'",
"sourceType" : "\"STRING\"",
"targetType" : "\"INT\""
Expand Down
1 change: 1 addition & 0 deletions sql/core/src/test/resources/sql-tests/analyzer-results/postgreSQL/window_part2.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ org.apache.spark.SparkNumberFormatException
"errorClass" : "CAST_INVALID_INPUT",
"sqlState" : "22018",
"messageParameters" : {
"ansiConfig" : "\"spark.sql.ansi.enabled\"",
"expression" : "'NaN'",
"sourceType" : "\"STRING\"",
"targetType" : "\"INT\""
Expand Down
4 changes: 4 additions & 0 deletions sql/core/src/test/resources/sql-tests/analyzer-results/sql-session-variables.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,7 @@ org.apache.spark.SparkNumberFormatException
"errorClass" : "CAST_INVALID_INPUT",
"sqlState" : "22018",
"messageParameters" : {
"ansiConfig" : "\"spark.sql.ansi.enabled\"",
"expression" : "'hello'",
"sourceType" : "\"STRING\"",
"targetType" : "\"INT\""
Expand Down Expand Up @@ -884,6 +885,7 @@ org.apache.spark.SparkArithmeticException
"errorClass" : "CAST_OVERFLOW",
"sqlState" : "22003",
"messageParameters" : {
"ansiConfig" : "\"spark.sql.ansi.enabled\"",
"sourceType" : "\"INT\"",
"targetType" : "\"SMALLINT\"",
"value" : "100000"
Expand Down Expand Up @@ -1000,6 +1002,7 @@ org.apache.spark.SparkArithmeticException
"errorClass" : "CAST_OVERFLOW",
"sqlState" : "22003",
"messageParameters" : {
"ansiConfig" : "\"spark.sql.ansi.enabled\"",
"sourceType" : "\"DOUBLE\"",
"targetType" : "\"INT\"",
"value" : "1.0E10D"
Expand Down Expand Up @@ -1059,6 +1062,7 @@ org.apache.spark.SparkNumberFormatException
"errorClass" : "CAST_INVALID_INPUT",
"sqlState" : "22018",
"messageParameters" : {
"ansiConfig" : "\"spark.sql.ansi.enabled\"",
"expression" : "'hello'",
"sourceType" : "\"STRING\"",
"targetType" : "\"INT\""
Expand Down
Loading