remove decimalMethod and do $$div

techaddict · techaddict · commit 8d9a04d61a15 · 2016-07-13T11:13:44.000+05:30
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala
@@ -209,7 +209,6 @@ case class Multiply(left: Expression, right: Expression)
 
 abstract class DivisionArithmetic extends BinaryArithmetic with NullIntolerant {
   override def nullable: Boolean = true
-  override def decimalMethod: String = "$div"
 
   private lazy val div: (Any, Any) => Any = dataType match {
     case ft: FractionalType => ft.fractional.asInstanceOf[Fractional[Any]].div
@@ -243,7 +242,7 @@ abstract class DivisionArithmetic extends BinaryArithmetic with NullIntolerant {
     }
     val javaType = ctx.javaType(dataType)
     val divide = if (dataType.isInstanceOf[DecimalType]) {
-      s"${eval1.value}." + "$div" + s"(${eval2.value})"
+      s"${eval1.value}.$$div(${eval2.value})"
     } else {
       s"($javaType)(${eval1.value} / ${eval2.value})"
     }

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,6 @@ case class Multiply(left: Expression, right: Expression)`
`209`	`209`
`210`	`210`	`abstract class DivisionArithmetic extends BinaryArithmetic with NullIntolerant {`
`211`	`211`	`override def nullable: Boolean = true`
`212`		`- override def decimalMethod: String = "$div"`
`213`	`212`
`214`	`213`	`private lazy val div: (Any, Any) => Any = dataType match {`
`215`	`214`	`case ft: FractionalType => ft.fractional.asInstanceOf[Fractional[Any]].div`
`@@ -243,7 +242,7 @@ abstract class DivisionArithmetic extends BinaryArithmetic with NullIntolerant {`
`243`	`242`	`}`
`244`	`243`	`val javaType = ctx.javaType(dataType)`
`245`	`244`	`val divide = if (dataType.isInstanceOf[DecimalType]) {`
`246`		`- s"${eval1.value}." + "$div" + s"(${eval2.value})"`
	`245`	`+ s"${eval1.value}.$$div(${eval2.value})"`
`247`	`246`	`} else {`
`248`	`247`	`s"($javaType)(${eval1.value} / ${eval2.value})"`
`249`	`248`	`}`