diff options
| author | Michael Armbrust <michael@databricks.com> | 2014-06-05 17:42:08 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-06-05 17:42:08 -0700 |
| commit | c7a183b2c2bca13565496495b4ae3a3a9f63f9ab (patch) | |
| tree | eb36bdc8caf9c002025ae1165674a89338294787 /sql/catalyst | |
| parent | 668cb1defe735add91f4a5b7b8ebe7cfd5640b25 (diff) | |
| download | spark-c7a183b2c2bca13565496495b4ae3a3a9f63f9ab.tar.gz spark-c7a183b2c2bca13565496495b4ae3a3a9f63f9ab.tar.bz2 spark-c7a183b2c2bca13565496495b4ae3a3a9f63f9ab.zip | |
[SPARK-2041][SQL] Correctly analyze queries where columnName == tableName.
Author: Michael Armbrust <michael@databricks.com>
Closes #985 from marmbrus/tableName and squashes the following commits:
3caaa27 [Michael Armbrust] Correctly analyze queries where columnName == tableName.
Diffstat (limited to 'sql/catalyst')
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala index 5eb52d5350..2b8fbdcde9 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala @@ -64,7 +64,8 @@ abstract class LogicalPlan extends QueryPlan[LogicalPlan] { // struct fields. val options = children.flatMap(_.output).flatMap { option => // If the first part of the desired name matches a qualifier for this possible match, drop it. - val remainingParts = if (option.qualifiers contains parts.head) parts.drop(1) else parts + val remainingParts = + if (option.qualifiers.contains(parts.head) && parts.size > 1) parts.drop(1) else parts if (option.name == remainingParts.head) (option, remainingParts.tail.toList) :: Nil else Nil } |