diff options
| author | Michael Armbrust <michael@databricks.com> | 2015-05-12 13:36:55 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-05-12 13:36:55 -0700 |
| commit | 2a41c0d71a13558f12c6811bf98791e01186f3ad (patch) | |
| tree | a566c930829d3dedbb77df4edf82cee703da6365 /sql | |
| parent | 595a67589a42f8025d3e5fd4da413b1faa2e14bf (diff) | |
| download | spark-2a41c0d71a13558f12c6811bf98791e01186f3ad.tar.gz spark-2a41c0d71a13558f12c6811bf98791e01186f3ad.tar.bz2 spark-2a41c0d71a13558f12c6811bf98791e01186f3ad.zip | |
[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 <michael@databricks.com>
Closes #6089 from marmbrus/betterBinaryError and squashes the following commits:
23b68ad [Michael Armbrust] [SPARK-7569][SQL] Better error for invalid binary expressions
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 c8288c6767..f104e742c9 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. |