Github user viirya commented on a diff in the pull request:
https://github.com/apache/spark/pull/15388#discussion_r82718343
--- Diff:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionSetSuite.scala
---
@@ -80,6 +80,65 @@ class ExpressionSetSuite extends SparkFunSuite {
setTest(1, Not(aUpper >= 1), aUpper < 1, Not(Literal(1) <= aUpper),
Literal(1) > aUpper)
setTest(1, Not(aUpper <= 1), aUpper > 1, Not(Literal(1) >= aUpper),
Literal(1) < aUpper)
+ // Reordering AND/OR expressions
+ setTest(1, aUpper > bUpper && aUpper <= 10, aUpper <= 10 && aUpper >
bUpper)
+ setTest(1,
+ aUpper > bUpper && bUpper > 100 && aUpper <= 10,
+ bUpper > 100 && aUpper <= 10 && aUpper > bUpper)
+
+ setTest(1, aUpper > bUpper || aUpper <= 10, aUpper <= 10 || aUpper >
bUpper)
+ setTest(1,
+ aUpper > bUpper || bUpper > 100 || aUpper <= 10,
+ bUpper > 100 || aUpper <= 10 || aUpper > bUpper)
+
+ setTest(1,
+ (aUpper <= 10 && aUpper > bUpper) || bUpper > 100,
+ bUpper > 100 || (aUpper <= 10 && aUpper > bUpper))
+
+ setTest(1,
+ aUpper >= bUpper || (aUpper > 10 && bUpper < 10),
+ (bUpper < 10 && aUpper > 10) || aUpper >= bUpper)
+
+ // More complicated cases mixing AND/OR
+ // Three predicates in the following:
+ // (bUpper > 100)
+ // (aUpper < 100 && bUpper <= aUpper)
+ // (aUpper >= 10 && bUpper >= 50)
+ // They can be reordered and the sub-predicates contained in each of
them can be reordered too.
+ setTest(1,
+ (bUpper > 100) || (aUpper < 100 && bUpper <= aUpper) || (aUpper >= 10
&& bUpper >= 50),
+ (aUpper >= 10 && bUpper >= 50) || (bUpper > 100) || (aUpper < 100 &&
bUpper <= aUpper),
+ (bUpper >= 50 && aUpper >= 10) || (bUpper <= aUpper && aUpper < 100)
|| (bUpper > 100))
+
+ // Two predicates in the following:
+ // (bUpper > 100 && aUpper < 100 && bUpper <= aUpper)
+ // (aUpper >= 10 && bUpper >= 50)
+ setTest(1,
+ (bUpper > 100 && aUpper < 100 && bUpper <= aUpper) || (aUpper >= 10 &&
bUpper >= 50),
+ (aUpper >= 10 && bUpper >= 50) || (aUpper < 100 && bUpper > 100 &&
bUpper <= aUpper),
+ (bUpper >= 50 && aUpper >= 10) || (bUpper <= aUpper && aUpper < 100 &&
bUpper > 100))
+
+ // Three predicates in the following:
+ // (aUpper >= 10)
+ // (bUpper <= 10 && aUpper === bUpper && aUpper < 100)
+ // (bUpper >= 100)
+ setTest(1,
+ (aUpper >= 10) || (bUpper <= 10 && aUpper === bUpper && aUpper < 100)
|| (bUpper >= 100),
+ (aUpper === bUpper && aUpper < 100 && bUpper <= 10) || (bUpper >= 100)
|| (aUpper >= 10),
+ (aUpper < 100 && bUpper <= 10 && aUpper === bUpper) || (aUpper >= 10)
|| (bUpper >= 100),
+ ((bUpper <= 10 && aUpper === bUpper) && aUpper < 100) || ((aUpper >=
10) || (bUpper >= 100)))
+
+ // Don't reorder non-deterministic expression in AND/OR.
+ setTest(2, Rand(1L) > aUpper && aUpper <= 10, aUpper <= 10 && Rand(1L) >
aUpper)
+ setTest(2,
+ aUpper > bUpper && bUpper > 100 && Rand(1L) > aUpper,
+ bUpper > 100 && Rand(1L) > aUpper && aUpper > bUpper)
+
+ setTest(2, Rand(1L) > aUpper || aUpper <= 10, aUpper <= 10 || Rand(1L) >
aUpper)
--- End diff --
Good to have. Added.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
