spark git commit: [SPARK-7569][SQL] Better error for invalid binary expressions

[rxin]

Repository: spark
Updated Branches:
  refs/heads/master 595a67589 -> 2a41c0d71


[SPARK-7569][SQL] Better error for invalid binary expressions

`scala> Seq((1,1)).toDF("a", "b").select(lit(1) + new java.sql.Date(1)) `

Before:

```
org.apache.spark.sql.AnalysisException: invalid expression (1 + 0) between 
Literal 1, IntegerType and Literal 0, DateType;
```

After:
```
org.apache.spark.sql.AnalysisException: invalid expression (1 + 0) between int 
and date;
```

Author: Michael Armbrust <mich...@databricks.com>

Closes #6089 from marmbrus/betterBinaryError and squashes the following commits:

23b68ad [Michael Armbrust] [SPARK-7569][SQL] Better error for invalid binary 
expressions


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2a41c0d7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2a41c0d7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2a41c0d7

Branch: refs/heads/master
Commit: 2a41c0d71a13558f12c6811bf98791e01186f3ad
Parents: 595a675
Author: Michael Armbrust <mich...@databricks.com>
Authored: Tue May 12 13:36:55 2015 -0700
Committer: Reynold Xin <r...@databricks.com>
Committed: Tue May 12 13:36:55 2015 -0700

----------------------------------------------------------------------
 .../org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/2a41c0d7/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
----------------------------------------------------------------------
diff --git 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
index c8288c6..f104e74 100644
--- 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
+++ 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
@@ -69,7 +69,7 @@ trait CheckAnalysis {
           case b: BinaryExpression if !b.resolved =>
             failAnalysis(
               s"invalid expression ${b.prettyString} " +
-                s"between ${b.left.simpleString} and ${b.right.simpleString}")
+              s"between ${b.left.dataType.simpleString} and 
${b.right.dataType.simpleString}")
 
           case w @ WindowExpression(windowFunction, windowSpec) if 
windowSpec.validate.nonEmpty =>
             // The window spec is not valid.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org