Fix a % b if a is a double

clockfly · clockfly · commit 955f49a5bf8e · 2016-09-21T08:19:46.000+08:00
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
@@ -310,7 +310,11 @@ case class Remainder(left: Expression, right: Expression)
       if (input1 == null) {
         null
       } else {
-        integral.rem(input1, input2)
+        input1 match {
+          case d: Double => d % input2.asInstanceOf[java.lang.Double]
+          case f: Float => f % input2.asInstanceOf[java.lang.Float]
+          case _ => integral.rem(input1, input2)
+        }
       }
     }
   }
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ArithmeticExpressionSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ArithmeticExpressionSuite.scala
@@ -175,6 +175,17 @@ class ArithmeticExpressionSuite extends SparkFunSuite with ExpressionEvalHelper
     }
   }
 
+  test("SPARK-17617: % (Remainder) double % double on super big double") {
+    val leftDouble = Literal(-5083676433652386516D)
+    val rightDouble = Literal(10D)
+    checkEvaluation(Remainder(leftDouble, rightDouble), -6.0D)
+
+    // Float has smaller precision
+    val leftFloat = Literal(-5083676433652386516F)
+    val rightFloat = Literal(10F)
+    checkEvaluation(Remainder(leftFloat, rightFloat), -2.0F)
+  }
+
   test("Abs") {
     testNumericDataTypes { convert =>
       val input = Literal(convert(1))

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,11 @@ case class Remainder(left: Expression, right: Expression)`
`310`	`310`	`if (input1 == null) {`
`311`	`311`	`null`
`312`	`312`	`} else {`
`313`		`- integral.rem(input1, input2)`
	`313`	`+ input1 match {`
	`314`	`+ case d: Double => d % input2.asInstanceOf[java.lang.Double]`
	`315`	`+ case f: Float => f % input2.asInstanceOf[java.lang.Float]`
	`316`	`+ case _ => integral.rem(input1, input2)`
	`317`	`+ }`
`314`	`318`	`}`
`315`	`319`	`}`
`316`	`320`	`}`