Skip to content

[SPARK-20211][SQL]Fix a bug in FLOOR and CEIL when a decimal's precision < scale #17529

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 4 commits into from
Closed

[SPARK-20211][SQL]Fix a bug in FLOOR and CEIL when a decimal's precision < scale #17529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b094b6
fix decimal floor/ceil precision bug
stanzhai Apr 4, 2017
2d60230
add test case
stanzhai Apr 4, 2017
61058b6
update test case
stanzhai Apr 4, 2017
08e58df
Merge branch 'master' of https://github.com/apache/spark into fix_dec…
stanzhai Jun 8, 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
6 changes: 4 additions & 2 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 @@ -227,7 +227,8 @@ case class Ceil(child: Expression) extends UnaryMathExpression(math.ceil, "CEIL"
override def dataType: DataType = child.dataType match {
case dt @ DecimalType.Fixed(_, 0) => dt
case DecimalType.Fixed(precision, scale) =>
DecimalType.bounded(precision - scale + 1, 0)
val boundedPrecision = if (precision < scale) 1 else precision - scale + 1
DecimalType.bounded(boundedPrecision, 0)
case _ => LongType
}

Expand Down Expand Up @@ -344,7 +345,8 @@ case class Floor(child: Expression) extends UnaryMathExpression(math.floor, "FLO
override def dataType: DataType = child.dataType match {
case dt @ DecimalType.Fixed(_, 0) => dt
case DecimalType.Fixed(precision, scale) =>
DecimalType.bounded(precision - scale + 1, 0)
val boundedPrecision = if (precision < scale) 1 else precision - scale + 1
DecimalType.bounded(boundedPrecision, 0)
case _ => LongType
}

Expand Down
6 changes: 4 additions & 2 deletions sql/catalyst/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 @@ -384,13 +384,15 @@ final class Decimal extends Ordered[Decimal] with Serializable {
def abs: Decimal = if (this.compare(Decimal.ZERO) < 0) this.unary_- else this

def floor: Decimal = if (scale == 0) this else {
val newPrecision = DecimalType.bounded(precision - scale + 1, 0).precision
val boundedPrecision = if (precision < scale) 1 else precision - scale + 1
val newPrecision = DecimalType.bounded(boundedPrecision, 0).precision
toPrecision(newPrecision, 0, ROUND_FLOOR).getOrElse(
throw new AnalysisException(s"Overflow when setting precision to $newPrecision"))
}

def ceil: Decimal = if (scale == 0) this else {
val newPrecision = DecimalType.bounded(precision - scale + 1, 0).precision
val boundedPrecision = if (precision < scale) 1 else precision - scale + 1
val newPrecision = DecimalType.bounded(boundedPrecision, 0).precision
toPrecision(newPrecision, 0, ROUND_CEILING).getOrElse(
throw new AnalysisException(s"Overflow when setting precision to $newPrecision"))
}
Expand Down
4 changes: 2 additions & 2 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 @@ -254,7 +254,7 @@ class MathExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
testUnary(Ceil, (d: Double) => math.ceil(d).toLong)
checkConsistencyBetweenInterpretedAndCodegen(Ceil, DoubleType)

testUnary(Ceil, (d: Decimal) => d.ceil, (-20 to 20).map(x => Decimal(x * 0.1)))
testUnary(Ceil, (d: Decimal) => d.ceil, (-20 to 20).map(x => Decimal(x * 0.0001)))
checkConsistencyBetweenInterpretedAndCodegen(Ceil, DecimalType(25, 3))
checkConsistencyBetweenInterpretedAndCodegen(Ceil, DecimalType(25, 0))
checkConsistencyBetweenInterpretedAndCodegen(Ceil, DecimalType(5, 0))
Expand All @@ -274,7 +274,7 @@ class MathExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
testUnary(Floor, (d: Double) => math.floor(d).toLong)
checkConsistencyBetweenInterpretedAndCodegen(Floor, DoubleType)

testUnary(Floor, (d: Decimal) => d.floor, (-20 to 20).map(x => Decimal(x * 0.1)))
testUnary(Floor, (d: Decimal) => d.floor, (-20 to 20).map(x => Decimal(x * 0.0001)))
checkConsistencyBetweenInterpretedAndCodegen(Floor, DecimalType(25, 3))
checkConsistencyBetweenInterpretedAndCodegen(Floor, DecimalType(25, 0))
checkConsistencyBetweenInterpretedAndCodegen(Floor, DecimalType(5, 0))
Expand Down
12 changes: 12 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2635,6 +2635,18 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext {
}
}

test("SPARK-20211: should be able to floor or ceil with a decimal when its precision < scale") {
val df = Seq(0).toDF("a")
withTempView("tb") {
df.createOrReplaceTempView("tb")
checkAnswer(sql("SELECT 1 > 0.00001 FROM tb"), Row(true))
checkAnswer(sql("SELECT floor(0.0001) FROM tb"), Row(0))
checkAnswer(sql("SELECT ceil(0.0001) FROM tb"), Row(1))
checkAnswer(sql("SELECT floor(0.00123) FROM tb"), Row(0))
checkAnswer(sql("SELECT floor(0.00010) FROM tb"), Row(0))
}
}

test("SPARK-12868: Allow adding jars from hdfs ") {
val jarFromHdfs = "hdfs://doesnotmatter/test.jar"
val jarFromInvalidFs = "fffs://doesnotmatter/test.jar"
Expand Down