You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/07/03 22:22:17 UTC
git commit: [SPARK-2342] Evaluation helper's output type doesn't
conform to input ty...
Repository: spark
Updated Branches:
refs/heads/master 2b36344f5 -> a9b52e562
[SPARK-2342] Evaluation helper's output type doesn't conform to input ty...
The function cast doesn't conform to the intention of "Those expressions are supposed to be in the same data type, and also the return type." comment
Author: Yijie Shen <he...@gmail.com>
Closes #1283 from yijieshen/master and squashes the following commits:
c7aaa4b [Yijie Shen] [SPARK-2342] Evaluation helper's output type doesn't conform to input type
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a9b52e56
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a9b52e56
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a9b52e56
Branch: refs/heads/master
Commit: a9b52e5623f7fc77fca96b095f9eeaef76e35d54
Parents: 2b36344
Author: Yijie Shen <he...@gmail.com>
Authored: Thu Jul 3 13:22:13 2014 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Thu Jul 3 13:22:13 2014 -0700
----------------------------------------------------------------------
.../org/apache/spark/sql/catalyst/expressions/Expression.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/a9b52e56/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala
----------------------------------------------------------------------
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
index 0411ce3..ba62dab 100644
--- 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")
}