You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by hv...@apache.org on 2017/03/14 13:02:52 UTC

spark git commit: [SPARK-18874][SQL] Fix 2.10 build after moving the subquery rules to optimization

Repository: spark
Updated Branches:
  refs/heads/master a0b92f73f -> 1c7275efa


[SPARK-18874][SQL] Fix 2.10 build after moving the subquery rules to optimization

## What changes were proposed in this pull request?
Commit https://github.com/apache/spark/commit/4ce970d71488c7de6025ef925f75b8b92a5a6a79 in accidentally broke the 2.10 build for Spark. This PR fixes this by simplifying the offending pattern match.

## How was this patch tested?
Existing tests.

Author: Herman van Hovell <hv...@databricks.com>

Closes #17288 from hvanhovell/SPARK-18874.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1c7275ef
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1c7275ef
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1c7275ef

Branch: refs/heads/master
Commit: 1c7275efa7bfaaa92719750e93a7b35cbcb48e45
Parents: a0b92f7
Author: Herman van Hovell <hv...@databricks.com>
Authored: Tue Mar 14 14:02:48 2017 +0100
Committer: Herman van Hovell <hv...@databricks.com>
Committed: Tue Mar 14 14:02:48 2017 +0100

----------------------------------------------------------------------
 .../org/apache/spark/sql/catalyst/expressions/subquery.scala     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/1c7275ef/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/subquery.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/subquery.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/subquery.scala
index ad11700..59db28d 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/subquery.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/subquery.scala
@@ -100,8 +100,8 @@ object SubExprUtils extends PredicateHelper {
    */
   def hasNullAwarePredicateWithinNot(condition: Expression): Boolean = {
     splitConjunctivePredicates(condition).exists {
-      case _: Exists | Not(_: Exists) | In(_, Seq(_: ListQuery)) | Not(In(_, Seq(_: ListQuery))) =>
-        false
+      case _: Exists | Not(_: Exists) => false
+      case In(_, Seq(_: ListQuery)) | Not(In(_, Seq(_: ListQuery))) => false
       case e => e.find { x =>
         x.isInstanceOf[Not] && e.find {
           case In(_, Seq(_: ListQuery)) => true


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org