Skip to content
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

[SPARK-20665][SQL]"Bround" and "Round" function return NULL #17906

Closed
wants to merge 2 commits into from
Closed

[SPARK-20665][SQL]"Bround" and "Round" function return NULL #17906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b6dab8
"Bround" function return NULL
10110346 May 9, 2017
09712e1
Fix:Add unit test case
10110346 May 9, 2017
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
12 changes: 6 additions & 6 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/mathExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,10 +1023,10 @@ abstract class RoundBase(child: Expression, scale: Expression,

// not overriding since _scale is a constant int at runtime
def nullSafeEval(input1: Any): Any = {
child.dataType match {
case _: DecimalType =>
dataType match {
case DecimalType.Fixed(_, s) =>
val decimal = input1.asInstanceOf[Decimal]
decimal.toPrecision(decimal.precision, _scale, mode).orNull
decimal.toPrecision(decimal.precision, s, mode).orNull
case ByteType =>
BigDecimal(input1.asInstanceOf[Byte]).setScale(_scale, mode).toByte
case ShortType =>
Expand Down Expand Up @@ -1055,10 +1055,10 @@ abstract class RoundBase(child: Expression, scale: Expression,
override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
val ce = child.genCode(ctx)

val evaluationCode = child.dataType match {
case _: DecimalType =>
val evaluationCode = dataType match {
case DecimalType.Fixed(_, s) =>
s"""
if (${ce.value}.changePrecision(${ce.value}.precision(), ${_scale},
if (${ce.value}.changePrecision(${ce.value}.precision(), ${s},
java.math.BigDecimal.${modeStr})) {
${ev.value} = ${ce.value};
} else {
Expand Down
7 changes: 3 additions & 4 deletions ...alyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MathExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,15 +546,14 @@ class MathExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
val bdResults: Seq[BigDecimal] = Seq(BigDecimal(3.0), BigDecimal(3.1), BigDecimal(3.14),
BigDecimal(3.142), BigDecimal(3.1416), BigDecimal(3.14159),
BigDecimal(3.141593), BigDecimal(3.1415927))
// round_scale > current_scale would result in precision increase
// and not allowed by o.a.s.s.types.Decimal.changePrecision, therefore null
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems we are changing the behavior, can you check with other database and see if it's expected to return the original value for this case?


(0 to 7).foreach { i =>
checkEvaluation(Round(bdPi, i), bdResults(i), EmptyRow)
checkEvaluation(BRound(bdPi, i), bdResults(i), EmptyRow)
}
(8 to 10).foreach { scale =>
checkEvaluation(Round(bdPi, scale), null, EmptyRow)
checkEvaluation(BRound(bdPi, scale), null, EmptyRow)
checkEvaluation(Round(bdPi, scale), bdPi, EmptyRow)
checkEvaluation(BRound(bdPi, scale), bdPi, EmptyRow)
}

DataTypeTestUtils.numericTypes.foreach { dataType =>
Expand Down
13 changes: 13 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/MathFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,19 @@ class MathFunctionsSuite extends QueryTest with SharedSQLContext {
Seq(Row(BigDecimal("0E3"), BigDecimal("0E2"), BigDecimal("0E1"), BigDecimal(3),
BigDecimal("3.1"), BigDecimal("3.14"), BigDecimal("3.142")))
)

val bdPi: BigDecimal = BigDecimal(31415925L, 7)
checkAnswer(
sql(s"SELECT round($bdPi, 7), round($bdPi, 8), round($bdPi, 9), round($bdPi, 10), " +
s"round($bdPi, 100), round($bdPi, 6), round(null, 8)"),
Seq(Row(bdPi, bdPi, bdPi, bdPi, bdPi, BigDecimal("3.141593"), null))
)

checkAnswer(
sql(s"SELECT bround($bdPi, 7), bround($bdPi, 8), bround($bdPi, 9), bround($bdPi, 10), " +
s"bround($bdPi, 100), bround($bdPi, 6), bround(null, 8)"),
Seq(Row(bdPi, bdPi, bdPi, bdPi, bdPi, BigDecimal("3.141592"), null))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about moving the test case to SQLQueryTestSuite and create a new file mathFunctions.sql. You can refer to s.c.s.t.resources/sql-tests/inputs/cast.sql. To generate the result file, you can run the following command:

SPARK_GENERATE_GOLDEN_FILES=1 build/sbt "sql/test-only *SQLQueryTestSuite"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can do it in a follow-up

)
}

test("round/bround with data frame from a local Seq of Product") {
Expand Down