Merge branch 'jiang.filter-set'

apache · Dec 7, 2015 · da46b1c · da46b1c
2 parents e63df88 + 9043afd
commit da46b1c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
@@ -65,6 +65,20 @@ trait PredicateHelper {
     }
   }
 
+  /**
+   * Returns true if two expressions are equivalent predicates. Equality check is tolerant of
+   * ordering different.
+   */
+  def equivalentPredicates(left: Expression, right: Expression): Boolean = {
+    val leftAndPredicates = splitConjunctivePredicates(left).toSet
+    val rightAndPredicates = splitConjunctivePredicates(right).toSet
+    val leftOrPredicates = splitDisjunctivePredicates(left).toSet
+    val rightOrPredicates = splitDisjunctivePredicates(right).toSet
+    // We split the two conditions into conjunctive predicates and disjunctive predicates
+    // If either of them match, we consider them equivalent conditions
+    (leftAndPredicates == rightAndPredicates) || (leftOrPredicates == rightOrPredicates)
+  }
+
   // Substitute any known alias from a map.
   protected def replaceAlias(
       condition: Expression,

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
@@ -129,31 +129,14 @@ abstract class LogicalPlan extends QueryPlan[LogicalPlan] with PredicateHelper w
         s"[${cleanRight.cleanArgs.mkString(", ")}] == [${cleanLeft.cleanArgs.mkString(", ")}]")
       (cleanRight.cleanArgs == cleanLeft.cleanArgs) || ((cleanLeft, cleanRight) match {
         case (l: Filter, r: Filter) =>
-          equivalentConditions(cleanExpression(l.condition, l.children.flatMap(_.output)),
+          equivalentPredicates(cleanExpression(l.condition, l.children.flatMap(_.output)),
             cleanExpression(r.condition, r.children.flatMap(_.output)))
         case _ => false
       })
     } &&
     (cleanLeft.children, cleanRight.children).zipped.forall(_ sameResult _)
   }
 
-  /**
-   * Returns true if two conditions are equivalent. Equality check is tolerant of ordering
-   * different.
-   */
-  def equivalentConditions(left: Expression, right: Expression): Boolean = {
-    logDebug(s"equivalentConditions: [${left.toString}] with [${right.toString}]")
-
-    val leftAndPredicates = splitConjunctivePredicates(left).toSet
-    val rightAndPredicates = splitConjunctivePredicates(right).toSet
-    val leftOrPredicates = splitDisjunctivePredicates(left).toSet
-    val rightOrPredicates = splitDisjunctivePredicates(right).toSet
-    logDebug(s"equivalentConditions Result: [${leftAndPredicates == rightAndPredicates}]")
-    // We split the two conditions into conjunctive predicates and disjunctive predicates
-    // If either of them match, we consider them equivalent conditions
-    (leftAndPredicates == rightAndPredicates) || (leftOrPredicates == rightOrPredicates)
-  }
-
   /** Clean an expression so that differences in expression id should not affect equality */
   def cleanExpression(e: Expression, input: Seq[Attribute]) = e match {
     case a: Alias =>