Skip to content

[SPARK-8206][SQL][WIP]Add function round #6836

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
zhichao-li wants to merge 4 commits into from
Closed

[SPARK-8206][SQL][WIP]Add function round #6836

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e66e8d
Add function round (squash)
zhichao-li Jun 16, 2015
918376d
add NAN checking
zhichao-li Jun 24, 2015
9ff6d2d
rename
zhichao-li Jun 24, 2015
2a6dc13
style and typo
zhichao-li Jun 24, 2015
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
Prev Previous commit
Next Next commit
rename
  • Loading branch information
@zhichao-li
zhichao-li committed Jun 24, 2015
commit 9ff6d2d30274fd73faae58a033face1d98e94ebe
22 changes: 13 additions & 9 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/math.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,35 +317,35 @@ case class Logarithm(left: Expression, right: Expression)
}
}

case class Round(left: Expression, right: Expression)
extends Expression with trees.BinaryNode[Expression] with Serializable {
case class Round(valueExpr: Expression, scaleExpr: Expression)
extends Expression with trees.BinaryNode[Expression] {

def this(left: Expression) = {
this(left, Literal(0))
}

override def nullable: Boolean = left.nullable || right.nullable
override def nullable: Boolean = valueExpr.nullable || scaleExpr.nullable

override lazy val resolved =
childrenResolved && checkInputDataTypes().isSuccess && !DecimalType.isFixed(dataType)

override def checkInputDataTypes(): TypeCheckResult = {
if ((left.dataType.isInstanceOf[NumericType] || left.dataType.isInstanceOf[NullType])
&& (right.dataType.isInstanceOf[IntegerType] || right.dataType.isInstanceOf[NullType])) {
if ((valueExpr.dataType.isInstanceOf[NumericType] || valueExpr.dataType.isInstanceOf[NullType])
&& (scaleExpr.dataType.isInstanceOf[IntegerType] || scaleExpr.dataType.isInstanceOf[NullType])) {
TypeCheckResult.TypeCheckSuccess
} else {
TypeCheckResult.TypeCheckFailure(
s"round accepts numeric types as the value and integer type as the scale")
}
}

override def toString: String = s"round($left, $right)"
override def toString: String = s"round($valueExpr, $scaleExpr)"

override def dataType: DataType = left.dataType
override def dataType: DataType = valueExpr.dataType

override def eval(input: InternalRow): Any = {
val valueEval = left.eval(input)
val scaleEval = right.eval(input)
val valueEval = valueExpr.eval(input)
val scaleEval = scaleExpr.eval(input)
if (valueEval == null || scaleEval == null) {
null
} else {
Expand Down Expand Up @@ -384,4 +384,8 @@ case class Round(left: Expression, right: Expression)
private def round(value: Decimal, scale: Int): Decimal = {
value.set(value.toBigDecimal, value.precision, scale.asInstanceOf[Integer])
}

override def left: Expression = valueExpr

override def right: Expression = scaleExpr
}