diff options
author | Michael Armbrust <michael@databricks.com> | 2015-02-11 12:31:56 -0800 |
---|---|---|
committer | Michael Armbrust <michael@databricks.com> | 2015-02-11 12:31:56 -0800 |
commit | a60d2b70adff3a8fb3bdfac226b1d86fdb443da4 (patch) | |
tree | 92f50bd56e8ffc48b77d7845585d15327f169431 /sql/hive | |
parent | 03bf704bf442ac7dd960795295b51957ce972491 (diff) | |
download | spark-a60d2b70adff3a8fb3bdfac226b1d86fdb443da4.tar.gz spark-a60d2b70adff3a8fb3bdfac226b1d86fdb443da4.tar.bz2 spark-a60d2b70adff3a8fb3bdfac226b1d86fdb443da4.zip |
[SPARK-5454] More robust handling of self joins
Also I fix a bunch of bad output in test cases.
Author: Michael Armbrust <michael@databricks.com>
Closes #4520 from marmbrus/selfJoin and squashes the following commits:
4f4a85c [Michael Armbrust] comments
49c8e26 [Michael Armbrust] fix tests
6fc38de [Michael Armbrust] fix style
55d64b3 [Michael Armbrust] fix dataframe selfjoins
Diffstat (limited to 'sql/hive')
-rw-r--r-- | sql/hive/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala index 081d94b6fc..44ee5ab597 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala @@ -35,11 +35,9 @@ class PlanTest extends FunSuite { * we must normalize them to check if two different queries are identical. */ protected def normalizeExprIds(plan: LogicalPlan) = { - val list = plan.flatMap(_.expressions.flatMap(_.references).map(_.exprId.id)) - val minId = if (list.isEmpty) 0 else list.min plan transformAllExpressions { case a: AttributeReference => - AttributeReference(a.name, a.dataType, a.nullable)(exprId = ExprId(a.exprId.id - minId)) + AttributeReference(a.name, a.dataType, a.nullable)(exprId = ExprId(0)) } } |