check for conflicting attributes in join resolution

marmbrus · marmbrus · commit a925d08d79be · 2015-03-16T21:48:25.000-07:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala
@@ -103,6 +103,13 @@ case class Join(
         left.output ++ right.output
     }
   }
+
+  def selfJoinResolved = left.outputSet.intersect(right.outputSet).isEmpty
+
+  // Joins are only resolved if they don't introduce ambiguious expression ids.
+  override lazy val resolved: Boolean = {
+    childrenResolved && !expressions.exists(!_.resolved) && selfJoinResolved
+  }
 }
 
 case class Except(left: LogicalPlan, right: LogicalPlan) extends BinaryNode {

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,13 @@ case class Join(`
`103`	`103`	`left.output ++ right.output`
`104`	`104`	`}`
`105`	`105`	`}`
	`106`	`+`
	`107`	`+ def selfJoinResolved = left.outputSet.intersect(right.outputSet).isEmpty`
	`108`	`+`
	`109`	`+ // Joins are only resolved if they don't introduce ambiguious expression ids.`
	`110`	`+ override lazy val resolved: Boolean = {`
	`111`	`+ childrenResolved && !expressions.exists(!_.resolved) && selfJoinResolved`
	`112`	`+ }`
`106`	`113`	`}`
`107`	`114`
`108`	`115`	`case class Except(left: LogicalPlan, right: LogicalPlan) extends BinaryNode {`