Skip to content

[SPARK-49634][SQL] Remove the ANSI config suggestion in NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION #54644

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

Open
rpnkv wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[SPARK-49634][SQL] Remove the ANSI config suggestion in NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION #54644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5d35db2
Add a test case to QueryExecutionErrorsSuite that describes the expec…
rpnkv Mar 4, 2026
089b049
Implement changes to satisfy the new test case in QueryExecutionError…
rpnkv Mar 4, 2026
8679fa4
Fix AvroLogicalTypeSuite tests
rpnkv Mar 4, 2026
2549d3b
Fix DecimalSuite tests
rpnkv Mar 4, 2026
04f20aa
Fix CastWithAnsiOnSuite tests
rpnkv Mar 4, 2026
34ee30a
Fix for extended SQL tests job
rpnkv Mar 2, 2026
0145664
Fix QueryExecutionAnsiErrorsSuite tests
rpnkv Mar 5, 2026
aa4154e
Change the error subclass name from 'WITH_SUGGESTION' to 'DEFAULT' to…
rpnkv Mar 5, 2026
0f0704d
Fix inaccurate naming: change 'WITHOUT_SUGGESTION' error subclass to …
rpnkv Mar 5, 2026
43a052b
Regenerate golden files for SQLQueryTestSuite.
rpnkv Mar 5, 2026
d41d8b0
Regenerate golden files for SparkThrowableSuite.
rpnkv Mar 5, 2026
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
8 changes: 4 additions & 4 deletions common/utils/src/main/resources/error/error-conditions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5026,14 +5026,14 @@
""
],
"subClass" : {
"WITHOUT_SUGGESTION" : {
"DEFAULT" : {
"message" : [
"The <roundedValue> rounded half up from <originalValue> cannot be represented as Decimal(<precision>, <scale>)."
"<value> cannot be represented as Decimal(<precision>, <scale>)."
]
},
"WITH_SUGGESTION" : {
"WITH_ROUND_ATTEMPT" : {
"message" : [
"<value> cannot be represented as Decimal(<precision>, <scale>). If necessary set <config> to \"false\" to bypass this error, and return NULL instead."
"The <roundedValue> rounded half up from <originalValue> cannot be represented as Decimal(<precision>, <scale>)."
]
}
},
Expand Down
5 changes: 2 additions & 3 deletions connector/avro/src/test/scala/org/apache/spark/sql/avro/AvroLogicalTypeSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,12 +439,11 @@ abstract class AvroLogicalTypeSuite extends QueryTest with SharedSparkSession {
assert(ex.getCondition.startsWith("FAILED_READ_FILE"))
checkError(
exception = ex.getCause.asInstanceOf[SparkArithmeticException],
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
condition = "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
parameters = Map(
"value" -> "0",
"precision" -> "4",
"scale" -> "2",
"config" -> "\"spark.sql.ansi.enabled\"")
"scale" -> "2")
)
}
}
Expand Down
5 changes: 2 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 @@ -187,12 +187,11 @@ private[sql] object DataTypeErrors extends DataTypeErrorsBase {
decimalScale: Int,
context: QueryContext): ArithmeticException = {
new SparkArithmeticException(
errorClass = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
errorClass = "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
messageParameters = Map(
"value" -> value.toPlainString,
"precision" -> decimalPrecision.toString,
"scale" -> decimalScale.toString,
"config" -> toSQLConf("spark.sql.ansi.enabled")),
"scale" -> decimalScale.toString),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand Down
2 changes: 1 addition & 1 deletion sql/api/src/main/scala/org/apache/spark/sql/types/Decimal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ final class Decimal extends Ordered[Decimal] with Serializable {
this.decimalVal = decimal.setScale(scale, ROUND_HALF_UP)
if (decimalVal.precision > precision) {
throw new SparkArithmeticException(
errorClass = "NUMERIC_VALUE_OUT_OF_RANGE.WITHOUT_SUGGESTION",
errorClass = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_ROUND_ATTEMPT",
messageParameters = Map(
"roundedValue" -> decimalVal.toString,
"originalValue" -> decimal.toString,
Expand Down
5 changes: 2 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 @@ -108,12 +108,11 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE
decimalScale: Int,
context: QueryContext = null): ArithmeticException = {
new SparkArithmeticException(
errorClass = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
errorClass = "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
messageParameters = Map(
"value" -> value.toPlainString,
"precision" -> decimalPrecision.toString,
"scale" -> decimalScale.toString,
"config" -> toSQLConf(SQLConf.ANSI_ENABLED.key)),
"scale" -> decimalScale.toString),
context = getQueryContext(context),
summary = getSummary(context))
}
Expand Down
5 changes: 2 additions & 3 deletions ...talyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastWithAnsiOnSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,12 +860,11 @@ class CastWithAnsiOnSuite extends CastSuiteBase with QueryErrorsBase {
exception = intercept[SparkArithmeticException](
cast(largeTime, DecimalType(2, 0)).eval()
),
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
condition = "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
parameters = Map(
"value" -> "86399.123456000",
"precision" -> "2",
"scale" -> "0",
"config" -> """"spark.sql.ansi.enabled""""
"scale" -> "0"
),
queryContext = Array(ExpectedContext(fragment = "", start = -1, stop = -1))
)
Expand Down
19 changes: 8 additions & 11 deletions 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 @@ -66,44 +66,41 @@ class DecimalSuite extends SparkFunSuite with PrivateMethodTester with SQLHelper

checkError(
exception = intercept[SparkArithmeticException](Decimal(170L, 2, 1)),
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
condition = "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
parameters = Map(
"value" -> "0",
"precision" -> "2",
"scale" -> "1",
"config" -> "\"spark.sql.ansi.enabled\""))
"scale" -> "1"))
checkError(
exception = intercept[SparkArithmeticException](Decimal(170L, 2, 0)),
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
condition = "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
parameters = Map(
"value" -> "0",
"precision" -> "2",
"scale" -> "0",
"config" -> "\"spark.sql.ansi.enabled\""))
"scale" -> "0"))
checkError(
exception = intercept[SparkArithmeticException](Decimal(BigDecimal("10.030"), 2, 1)),
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITHOUT_SUGGESTION",
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_ROUND_ATTEMPT",
parameters = Map(
"roundedValue" -> "10.0",
"originalValue" -> "10.030",
"precision" -> "2",
"scale" -> "1"))
checkError(
exception = intercept[SparkArithmeticException](Decimal(BigDecimal("-9.95"), 2, 1)),
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITHOUT_SUGGESTION",
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_ROUND_ATTEMPT",
parameters = Map(
"roundedValue" -> "-10.0",
"originalValue" -> "-9.95",
"precision" -> "2",
"scale" -> "1"))
checkError(
exception = intercept[SparkArithmeticException](Decimal(1e17.toLong, 17, 0)),
condition = "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
condition = "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
parameters = Map(
"value" -> "0",
"precision" -> "17",
"scale" -> "0",
"config" -> "\"spark.sql.ansi.enabled\""))
"scale" -> "0"))
checkError(
exception = intercept[AnalysisException](Decimal(BigDecimal("10"), 2, -5)),
condition = "NEGATIVE_SCALE_DISALLOWED",
Expand Down
15 changes: 5 additions & 10 deletions sql/core/src/test/resources/sql-tests/results/cast.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,10 +1146,9 @@ struct<>
-- !query output
org.apache.spark.SparkArithmeticException
{
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
"sqlState" : "22003",
"messageParameters" : {
"config" : "\"spark.sql.ansi.enabled\"",
"precision" : "4",
"scale" : "2",
"value" : "123.45"
Expand Down Expand Up @@ -1611,10 +1610,9 @@ struct<>
-- !query output
org.apache.spark.SparkArithmeticException
{
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
"sqlState" : "22003",
"messageParameters" : {
"config" : "\"spark.sql.ansi.enabled\"",
"precision" : "1",
"scale" : "0",
"value" : "10.123000"
Expand Down Expand Up @@ -2299,10 +2297,9 @@ struct<>
-- !query output
org.apache.spark.SparkArithmeticException
{
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
"sqlState" : "22003",
"messageParameters" : {
"config" : "\"spark.sql.ansi.enabled\"",
"precision" : "1",
"scale" : "0",
"value" : "60.000000000"
Expand All @@ -2324,10 +2321,9 @@ struct<>
-- !query output
org.apache.spark.SparkArithmeticException
{
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
"sqlState" : "22003",
"messageParameters" : {
"config" : "\"spark.sql.ansi.enabled\"",
"precision" : "3",
"scale" : "0",
"value" : "3600.000000000"
Expand All @@ -2349,10 +2345,9 @@ struct<>
-- !query output
org.apache.spark.SparkArithmeticException
{
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.WITH_SUGGESTION",
"errorClass" : "NUMERIC_VALUE_OUT_OF_RANGE.DEFAULT",
"sqlState" : "22003",
"messageParameters" : {
"config" : "\"spark.sql.ansi.enabled\"",
"precision" : "5",
"scale" : "2",
"value" : "36000.000000000"
Expand Down
Loading