fix empty condition

Davies Liu · Davies Liu · commit 556a3828e4bc · 2015-12-02T09:57:30.000-08:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
@@ -749,8 +749,8 @@ object ReorderJoin extends Rule[LogicalPlan] with PredicateHelper {
 
   def apply(plan: LogicalPlan): LogicalPlan = plan transform {
     // TODO: support outer join
-    case j @ ExtractFiltersAndInnerJoins(input, conditions) if input.size > 2 =>
-      assert(conditions.nonEmpty)
+    case j @ ExtractFiltersAndInnerJoins(input, conditions)
+        if input.size > 2 && conditions.nonEmpty =>
       createOrderedJoin(input, conditions)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -749,8 +749,8 @@ object ReorderJoin extends Rule[LogicalPlan] with PredicateHelper {`
`749`	`749`
`750`	`750`	`def apply(plan: LogicalPlan): LogicalPlan = plan transform {`
`751`	`751`	`// TODO: support outer join`
`752`		`- case j @ ExtractFiltersAndInnerJoins(input, conditions) if input.size > 2 =>`
`753`		`- assert(conditions.nonEmpty)`
	`752`	`+ case j @ ExtractFiltersAndInnerJoins(input, conditions)`
	`753`	`+ if input.size > 2 && conditions.nonEmpty =>`
`754`	`754`	`createOrderedJoin(input, conditions)`
`755`	`755`	`}`
`756`	`756`	`}`