[SPARK-2342] Evaluation helper's output type doesn't conform to input type

yjshen · yjshen · commit c7aaa4bf1bd9 · 2014-07-02T16:24:25.000+08:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala
@@ -111,7 +111,7 @@ abstract class Expression extends TreeNode[Expression] {
       } else {
         e1.dataType match {
           case n: NumericType =>
-            f.asInstanceOf[(Numeric[n.JvmType], n.JvmType, n.JvmType) => Int](
+            f.asInstanceOf[(Numeric[n.JvmType], n.JvmType, n.JvmType) => n.JvmType](
               n.numeric, evalE1.asInstanceOf[n.JvmType], evalE2.asInstanceOf[n.JvmType])
           case other => sys.error(s"Type $other does not support numeric operations")
         }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ abstract class Expression extends TreeNode[Expression] {`
`111`	`111`	`} else {`
`112`	`112`	`e1.dataType match {`
`113`	`113`	`case n: NumericType =>`
`114`		`- f.asInstanceOf[(Numeric[n.JvmType], n.JvmType, n.JvmType) => Int](`
	`114`	`+ f.asInstanceOf[(Numeric[n.JvmType], n.JvmType, n.JvmType) => n.JvmType](`
`115`	`115`	`n.numeric, evalE1.asInstanceOf[n.JvmType], evalE2.asInstanceOf[n.JvmType])`
`116`	`116`	`case other => sys.error(s"Type $other does not support numeric operations")`
`117`	`117`	`}`