change code

apache · Mar 22, 2018 · 80b714e · 80b714e
1 parent 69e0981
commit 80b714e
Showing 1 changed file with 8 additions and 6 deletions.
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
@@ -53,6 +53,7 @@ abstract class Optimizer(sessionCatalog: SessionCatalog)
         PushProjectionThroughUnion,
         ReorderJoin,
         EliminateOuterJoin,
+        RewritePredicateSubquery,
         PushPredicateThroughJoin,
         PushDownPredicate,
         LimitPushDown,
@@ -134,11 +135,6 @@ abstract class Optimizer(sessionCatalog: SessionCatalog)
       ReplaceExceptWithFilter,
       ReplaceExceptWithAntiJoin,
       ReplaceDistinctWithAggregate) ::
-    Batch("RewriteSubquery", Once,
-        RewritePredicateSubquery,
-        ColumnPruning,
-        CollapseProject,
-        RemoveRedundantProject) ::
     Batch("Aggregate", fixedPoint,
       RemoveLiteralFromGroupExpressions,
       RemoveRepetitionFromGroupExpressions) :: Nil ++
@@ -155,7 +151,13 @@ abstract class Optimizer(sessionCatalog: SessionCatalog)
       PropagateEmptyRelation) :+
     // The following batch should be executed after batch "Join Reorder" and "LocalRelation".
     Batch("Check Cartesian Products", Once,
-      CheckCartesianProducts)
+      CheckCartesianProducts) :+
+    Batch("RewriteSubquery", Once,
+      ColumnPruning,
+      CollapseProject,
+      RemoveRedundantProject)
+
+
   }
 
   /**