You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2015/09/11 23:58:08 UTC
spark git commit: [SPARK-7142] [SQL] Minor enhancement to
BooleanSimplification Optimizer rule. Incorporate review comments
Repository: spark
Updated Branches:
refs/heads/master d5d647380 -> 1eede3b25
[SPARK-7142] [SQL] Minor enhancement to BooleanSimplification Optimizer rule. Incorporate review comments
Adding changes suggested by cloud-fan in #5700
cc marmbrus
Author: Yash Datta <Ya...@guavus.com>
Closes #8716 from saucam/bool_simp.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1eede3b2
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1eede3b2
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1eede3b2
Branch: refs/heads/master
Commit: 1eede3b254ee3793841c92971707094ac8afee35
Parents: d5d6473
Author: Yash Datta <Ya...@guavus.com>
Authored: Fri Sep 11 14:55:15 2015 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Fri Sep 11 14:55:15 2015 -0700
----------------------------------------------------------------------
.../org/apache/spark/sql/catalyst/optimizer/Optimizer.scala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1eede3b2/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
----------------------------------------------------------------------
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
index d9b50f3..0f4caec 100644
--- 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
@@ -435,10 +435,10 @@ object BooleanSimplification extends Rule[LogicalPlan] with PredicateHelper {
// a && a => a
case (l, r) if l fastEquals r => l
// a && (not(a) || b) => a && b
- case (l, Or(l1, r)) if (Not(l) fastEquals l1) => And(l, r)
- case (l, Or(r, l1)) if (Not(l) fastEquals l1) => And(l, r)
- case (Or(l, l1), r) if (l1 fastEquals Not(r)) => And(l, r)
- case (Or(l1, l), r) if (l1 fastEquals Not(r)) => And(l, r)
+ case (l, Or(l1, r)) if (Not(l) == l1) => And(l, r)
+ case (l, Or(r, l1)) if (Not(l) == l1) => And(l, r)
+ case (Or(l, l1), r) if (l1 == Not(r)) => And(l, r)
+ case (Or(l1, l), r) if (l1 == Not(r)) => And(l, r)
// (a || b) && (a || c) => a || (b && c)
case _ =>
// 1. Split left and right to get the disjunctive predicates,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org