Skip to content

Use half-even rounding #141

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

Merged
merged 1 commit into from
Jan 8, 2016
Merged

Use half-even rounding #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 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 @@ -620,7 +620,7 @@ case class Logarithm(left: Expression, right: Expression)
case class Round(child: Expression, scale: Expression)
extends BinaryExpression with ImplicitCastInputTypes {

import BigDecimal.RoundingMode.HALF_UP
import BigDecimal.RoundingMode.HALF_EVEN

def this(child: Expression) = this(child, Literal(0))

Expand Down Expand Up @@ -679,26 +679,26 @@ case class Round(child: Expression, scale: Expression)
val decimal = input1.asInstanceOf[Decimal]
if (decimal.changePrecision(decimal.precision, _scale)) decimal else null
case ByteType =>
BigDecimal(input1.asInstanceOf[Byte]).setScale(_scale, HALF_UP).toByte
BigDecimal(input1.asInstanceOf[Byte]).setScale(_scale, HALF_EVEN).toByte
case ShortType =>
BigDecimal(input1.asInstanceOf[Short]).setScale(_scale, HALF_UP).toShort
BigDecimal(input1.asInstanceOf[Short]).setScale(_scale, HALF_EVEN).toShort
case IntegerType =>
BigDecimal(input1.asInstanceOf[Int]).setScale(_scale, HALF_UP).toInt
BigDecimal(input1.asInstanceOf[Int]).setScale(_scale, HALF_EVEN).toInt
case LongType =>
BigDecimal(input1.asInstanceOf[Long]).setScale(_scale, HALF_UP).toLong
BigDecimal(input1.asInstanceOf[Long]).setScale(_scale, HALF_EVEN).toLong
case FloatType =>
val f = input1.asInstanceOf[Float]
if (f.isNaN || f.isInfinite) {
f
} else {
BigDecimal(f).setScale(_scale, HALF_UP).toFloat
BigDecimal(f).setScale(_scale, HALF_EVEN).toFloat
}
case DoubleType =>
val d = input1.asInstanceOf[Double]
if (d.isNaN || d.isInfinite) {
d
} else {
BigDecimal(d).setScale(_scale, HALF_UP).toDouble
BigDecimal(d).setScale(_scale, HALF_EVEN).toDouble
}
}
}
Expand All @@ -718,31 +718,31 @@ case class Round(child: Expression, scale: Expression)
if (_scale < 0) {
s"""
${ev.primitive} = new java.math.BigDecimal(${ce.primitive}).
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_UP).byteValue();"""
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_EVEN).byteValue();"""
} else {
s"${ev.primitive} = ${ce.primitive};"
}
case ShortType =>
if (_scale < 0) {
s"""
${ev.primitive} = new java.math.BigDecimal(${ce.primitive}).
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_UP).shortValue();"""
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_EVEN).shortValue();"""
} else {
s"${ev.primitive} = ${ce.primitive};"
}
case IntegerType =>
if (_scale < 0) {
s"""
${ev.primitive} = new java.math.BigDecimal(${ce.primitive}).
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_UP).intValue();"""
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_EVEN).intValue();"""
} else {
s"${ev.primitive} = ${ce.primitive};"
}
case LongType =>
if (_scale < 0) {
s"""
${ev.primitive} = new java.math.BigDecimal(${ce.primitive}).
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_UP).longValue();"""
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_EVEN).longValue();"""
} else {
s"${ev.primitive} = ${ce.primitive};"
}
Expand All @@ -760,7 +760,7 @@ case class Round(child: Expression, scale: Expression)
${ev.primitive} = ${ce.primitive};
} else {
${ev.primitive} = java.math.BigDecimal.valueOf(${ce.primitive}).
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_UP).floatValue();
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_EVEN).floatValue();
}"""
}
case DoubleType => // if child eval to NaN or Infinity, just return it.
Expand All @@ -777,7 +777,7 @@ case class Round(child: Expression, scale: Expression)
${ev.primitive} = ${ce.primitive};
} else {
${ev.primitive} = java.math.BigDecimal.valueOf(${ce.primitive}).
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_UP).doubleValue();
setScale(${_scale}, java.math.BigDecimal.ROUND_HALF_EVEN).doubleValue();
}"""
}
}
Expand Down