return long

mgaido91 · mgaido91 · commit fca5e62d5b0b · 2018-09-14T12:00:47.000+02: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
@@ -325,13 +325,18 @@ case class Divide(left: Expression, right: Expression) extends DivModLike {
 case class IntegralDivide(left: Expression, right: Expression) extends DivModLike {
 
   override def inputType: AbstractDataType = IntegralType
+  override def dataType: DataType = LongType
 
   override def symbol: String = "/"
   override def sqlOperator: String = "div"
 
-  private lazy val div: (Any, Any) => Any = dataType match {
-    case i: IntegralType => i.integral.asInstanceOf[Integral[Any]].quot
+  private lazy val div: (Any, Any) => Long = left.dataType match {
+    case i: IntegralType =>
+      val divide = i.integral.asInstanceOf[Integral[Any]].quot _
+      val toLong = i.integral.asInstanceOf[Integral[Any]].toLong _
+      (x, y) => toLong(divide(x, y))
   }
+
   override def evalOperation(left: Any, right: Any): Any = div(left, right)
 }
 
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
@@ -144,12 +144,12 @@ class ArithmeticExpressionSuite extends SparkFunSuite with ExpressionEvalHelper
   }
 
   test("/ (Divide) for integral type") {
-    checkEvaluation(IntegralDivide(Literal(1.toByte), Literal(2.toByte)), 0.toByte)
-    checkEvaluation(IntegralDivide(Literal(1.toShort), Literal(2.toShort)), 0.toShort)
-    checkEvaluation(IntegralDivide(Literal(1), Literal(2)), 0)
-    checkEvaluation(IntegralDivide(Literal(1.toLong), Literal(2.toLong)), 0.toLong)
-    checkEvaluation(IntegralDivide(positiveShortLit, negativeShortLit), 0.toShort)
-    checkEvaluation(IntegralDivide(positiveIntLit, negativeIntLit), 0)
+    checkEvaluation(IntegralDivide(Literal(1.toByte), Literal(2.toByte)), 0L)
+    checkEvaluation(IntegralDivide(Literal(1.toShort), Literal(2.toShort)), 0L)
+    checkEvaluation(IntegralDivide(Literal(1), Literal(2)), 0L)
+    checkEvaluation(IntegralDivide(Literal(1.toLong), Literal(2.toLong)), 0L)
+    checkEvaluation(IntegralDivide(positiveShortLit, negativeShortLit), 0L)
+    checkEvaluation(IntegralDivide(positiveIntLit, negativeIntLit), 0L)
     checkEvaluation(IntegralDivide(positiveLongLit, negativeLongLit), 0L)
   }
 
diff --git a/sql/core/src/test/resources/sql-tests/results/operators.sql.out b/sql/core/src/test/resources/sql-tests/results/operators.sql.out
@@ -157,31 +157,31 @@ NULL
 -- !query 19
 select 5 div 2
 -- !query 19 schema
-struct<(5 div 2):int>
+struct<(5 div 2):bigint>
 -- !query 19 output
 2
 
 
 -- !query 20
 select 5 div 0
 -- !query 20 schema
-struct<(5 div 0):int>
+struct<(5 div 0):bigint>
 -- !query 20 output
 NULL
 
 
 -- !query 21
 select 5 div null
 -- !query 21 schema
-struct<(5 div CAST(NULL AS INT)):int>
+struct<(5 div CAST(NULL AS INT)):bigint>
 -- !query 21 output
 NULL
 
 
 -- !query 22
 select null div 5
 -- !query 22 schema
-struct<(CAST(NULL AS INT) div 5):int>
+struct<(CAST(NULL AS INT) div 5):bigint>
 -- !query 22 output
 NULL
 
