[GitHub] spark pull request #15388: [SPARK-17821][SQL] Support And and Or in Expressi...
Github user asfgit closed the pull request at: https://github.com/apache/spark/pull/15388 --- 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
[GitHub] spark pull request #15388: [SPARK-17821][SQL] Support And and Or in Expressi...
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
[GitHub] spark pull request #15388: [SPARK-17821][SQL] Support And and Or in Expressi...
Github user rxin commented on a diff in the pull request:
https://github.com/apache/spark/pull/15388#discussion_r82536075
--- Diff:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionSetSuite.scala
---
@@ -80,6 +80,59 @@ 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)
+ 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,
+bUpper > 100 || aUpper <= 10 && aUpper > bUpper,
+bUpper > 100 || (aUpper <= 10 && aUpper > bUpper))
+
+ setTest(1,
+aUpper > 10 && bUpper < 10 || aUpper >= bUpper,
+(bUpper < 10 && aUpper > 10) || aUpper >= bUpper)
+
+ setTest(1,
--- End diff --
For these few test cases, they are getting too complicated that a human
won't be able to tell immediately what the case is testing for. We should add
some comment explaining what is being tested.
---
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
[GitHub] spark pull request #15388: [SPARK-17821][SQL] Support And and Or in Expressi...
Github user viirya commented on a diff in the pull request:
https://github.com/apache/spark/pull/15388#discussion_r82336141
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Canonicalize.scala
---
@@ -62,6 +62,9 @@ object Canonicalize extends {
case a: Add => orderCommutative(a, { case Add(l, r) => Seq(l, r)
}).reduce(Add)
case m: Multiply => orderCommutative(m, { case Multiply(l, r) =>
Seq(l, r) }).reduce(Multiply)
+case o: Or => orderCommutative(o, { case Or(l, r) => Seq(l, r)
}).reduce(Or)
--- End diff --
oh. it makes sense. updated.
---
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
[GitHub] spark pull request #15388: [SPARK-17821][SQL] Support And and Or in Expressi...
GitHub user viirya opened a pull request: https://github.com/apache/spark/pull/15388 [SPARK-17821][SQL] Support And and Or in Expression Canonicalize ## What changes were proposed in this pull request? Currently `Canonicalize` object doesn't support `And` and `Or`. So we can compare canonicalized form of predicates consistently. We should add the support. ## How was this patch tested? Jenkins tests. You can merge this pull request into a Git repository by running: $ git pull https://github.com/viirya/spark-1 canonicalize-and-or Alternatively you can review and apply these changes as the patch at: https://github.com/apache/spark/pull/15388.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #15388 commit 7e2535554d5a0661490b74ff4422798d98063214 Author: Liang-Chi Hsieh Date: 2016-10-07T02:54:34Z Support And and Or in Canonicalize. --- 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
