Skip to content

[SPARK-45786][SQL][FOLLOWUP][TEST] Fix Decimal random number tests with ANSI enabled #43853

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
wants to merge 3 commits into from
Closed

[SPARK-45786][SQL][FOLLOWUP][TEST] Fix Decimal random number tests with ANSI enabled #43853

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0babef4
[SPARK-45786][SQL][FOLLOWUP][TEST] Fix Decimal random number tests wi…
kazuyukitanimura Nov 16, 2023
d2a3f64
Merge remote-tracking branch 'upstream/master' into SPARK-45786-FollowUp
kazuyukitanimura Nov 16, 2023
9e14251
address review comments
kazuyukitanimura Nov 17, 2023
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
21 changes: 17 additions & 4 deletions .../src/test/scala/org/apache/spark/sql/catalyst/expressions/ArithmeticExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,25 +308,38 @@ class ArithmeticExpressionSuite extends SparkFunSuite with ExpressionEvalHelper
val mulResult = Decimal(mulExact.setScale(mulType.scale, RoundingMode.HALF_UP))
val mulExpected =
if (mulResult.precision > DecimalType.MAX_PRECISION) null else mulResult
checkEvaluation(mulActual, mulExpected)
tryCheckEvaluation(mulActual, mulExpected)

val divType = Divide(null, null).resultDecimalType(p1, s1, p2, s2)
val divResult = Decimal(divExact.setScale(divType.scale, RoundingMode.HALF_UP))
val divExpected =
if (divResult.precision > DecimalType.MAX_PRECISION) null else divResult
checkEvaluation(divActual, divExpected)
tryCheckEvaluation(divActual, divExpected)

val remType = Remainder(null, null).resultDecimalType(p1, s1, p2, s2)
val remResult = Decimal(remExact.setScale(remType.scale, RoundingMode.HALF_UP))
val remExpected =
if (remResult.precision > DecimalType.MAX_PRECISION) null else remResult
checkEvaluation(remActual, remExpected)
tryCheckEvaluation(remActual, remExpected)

val quotType = IntegralDivide(null, null).resultDecimalType(p1, s1, p2, s2)
val quotResult = Decimal(quotExact.setScale(quotType.scale, RoundingMode.HALF_UP))
val quotExpected =
if (quotResult.precision > DecimalType.MAX_PRECISION) null else quotResult
checkEvaluation(quotActual, quotExpected.toLong)
tryCheckEvaluation(quotActual, quotExpected.toLong)
}
}

def tryCheckEvaluation(actual: BinaryArithmetic, expected: Any): Unit = {
try {
checkEvaluation(actual, expected)
}
catch {
// Ignore NUMERIC_VALUE_OUT_OF_RANGE when ANSI is enabled
case e: org.scalatest.exceptions.TestFailedException
if e.cause.exists(c => c.isInstanceOf[SparkArithmeticException] &&
c.asInstanceOf[SparkArithmeticException].getErrorClass
== "NUMERIC_VALUE_OUT_OF_RANGE") && SQLConf.get.ansiEnabled =>
}
}
}
Expand Down