Skip to content

[SPARK-8279][SQL]Add math function round #6938

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

[SPARK-8279][SQL]Add math function round #6938

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
653d047
Add math function round
yjshen Jun 22, 2015
7e163ae
style fix
yjshen Jun 22, 2015
56db4bb
Add decimal support to Round
yjshen Jun 23, 2015
7c83e13
more tests on round
yjshen Jun 23, 2015
9be894e
add round functions in o.a.s.sql.functions
yjshen Jun 23, 2015
6cd9a64
refactor Round's constructor
yjshen Jun 23, 2015
2077888
codegen versioned eval
yjshen Jun 23, 2015
5486b2d
DataFrame API modification
yjshen Jun 23, 2015
1b87540
modify checkInputDataTypes using foldable
yjshen Jun 24, 2015
e6f44c4
refactor eval and genCode
yjshen Jun 24, 2015
9bd6930
revert accidental change
yjshen Jun 24, 2015
b0bff79
make round's inner method's name more meaningful
yjshen Jul 3, 2015
c3b9839
rely on implict cast to handle string input
yjshen Jul 3, 2015
d10be4a
use TypeCollection to specify wanted input and implicit cast
yjshen Jul 3, 2015
9555e35
tiny style fix
yjshen Jul 3, 2015
8c7a949
rebase & inputTypes update
yjshen Jul 6, 2015
31dfe7c
refactor round to make it readable
yjshen Jul 10, 2015
302a78a
Add dataframe function test
yjshen Jul 10, 2015
61760ee
address reviews
yjshen Jul 11, 2015
392b65b
add negative scale test in DecimalSuite
yjshen Jul 14, 2015
07a124c
remove useless def children
yjshen Jul 15, 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
style fix
  • Loading branch information
@yjshen
yjshen committed Jul 14, 2015
commit 7e163aebaad2f58c6cf376df8e1f908c27979dbd
28 changes: 14 additions & 14 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/BigDecimalConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package org.apache.spark.sql.catalyst.util

trait BigDecimalConverter[T] {
def toBigDecimal(in: T) : BigDecimal
def fromBigDecimal(bd: BigDecimal) : T
def toBigDecimal(in: T): BigDecimal
def fromBigDecimal(bd: BigDecimal): T
}

/**
Expand All @@ -29,32 +29,32 @@ trait BigDecimalConverter[T] {
object BigDecimalConverter {

implicit object ByteConverter extends BigDecimalConverter[Byte] {
def toBigDecimal(in: Byte) = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal) = bd.toByte
def toBigDecimal(in: Byte): BigDecimal = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal): Byte = bd.toByte
}

implicit object ShortConverter extends BigDecimalConverter[Short] {
def toBigDecimal(in: Short) = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal) = bd.toShort
def toBigDecimal(in: Short): BigDecimal = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal): Short = bd.toShort
}

implicit object IntConverter extends BigDecimalConverter[Int] {
def toBigDecimal(in: Int) = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal) = bd.toInt
def toBigDecimal(in: Int): BigDecimal = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal): Int = bd.toInt
}

implicit object LongConverter extends BigDecimalConverter[Long] {
def toBigDecimal(in: Long) = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal) = bd.toLong
def toBigDecimal(in: Long): BigDecimal = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal): Long = bd.toLong
}

implicit object FloatConverter extends BigDecimalConverter[Float] {
def toBigDecimal(in: Float) = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal) = bd.toFloat
def toBigDecimal(in: Float): BigDecimal = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal): Float = bd.toFloat
}

implicit object DoubleConverter extends BigDecimalConverter[Double] {
def toBigDecimal(in: Double) = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal) = bd.toDouble
def toBigDecimal(in: Double): BigDecimal = BigDecimal(in)
def fromBigDecimal(bd: BigDecimal): Double = bd.toDouble
}
}
2 changes: 1 addition & 1 deletion ...t/src/test/scala/org/apache/spark/sql/catalyst/analysis/ExpressionTypeCheckingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class ExpressionTypeCheckingSuite extends SparkFunSuite {

test("check types for ROUND") {
assertError(Round(Seq()), "ROUND require one or two arguments")
assertError(Round(Seq(Literal(null),'booleanField)),
assertError(Round(Seq(Literal(null), 'booleanField)),
"Only Integral Literal or Null Literal are allowed for ROUND scale argument")
assertError(Round(Seq(Literal(null), 'complexField)),
"Only Integral Literal or Null Literal are allowed for ROUND scale argument")
Expand Down