svn commit: r991054 - in /hadoop/pig/trunk/src/org/apache/pig: Main.java newplan/logical/optimizer/LogicalPlanOptimizer.java

[da...@apache.org]

Author: daijy
Date: Tue Aug 31 01:36:38 2010
New Revision: 991054

URL: http://svn.apache.org/viewvc?rev=991054&view=rev
Log:
PIG-1178: LogicalPlan and Optimizer are too complex and hard to work with (PIG-1178-9.patch)

Modified:
    hadoop/pig/trunk/src/org/apache/pig/Main.java
    hadoop/pig/trunk/src/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java

Modified: hadoop/pig/trunk/src/org/apache/pig/Main.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/Main.java?rev=991054&r1=991053&r2=991054&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/Main.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/Main.java Tue Aug 31 01:36:38 2010
@@ -681,8 +681,7 @@ public static void usage()
         System.out.println("    -t, -optimizer_off - Turn optimizations off. The following values are supported:");
         System.out.println("            SplitFilter - Split filter conditions");
         System.out.println("            MergeFilter - Merge filter conditions");
-        System.out.println("            PushUpFilter - Filter as early as possible (except ForEach)");
-        System.out.println("            FilterAboveForeach - Filter as early as possible (deal with ForEach case)");
+        System.out.println("            PushUpFilter - Filter as early as possible");
         System.out.println("            PushDownForeachFlatten - Join or explode as late as possible");
         System.out.println("            ColumnMapKeyPrune - Remove unused data");
         System.out.println("            LimitOptimizer - Limit as early as possible");

Modified: hadoop/pig/trunk/src/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java?rev=991054&r1=991053&r2=991054&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java Tue Aug 31 01:36:38 2010
@@ -107,7 +107,7 @@ public class LogicalPlanOptimizer extend
         s = new HashSet<Rule>();
         r = new PushUpFilter("PushUpFilter");
         checkAndAddRule(s, r);
-        r = new FilterAboveForeach("FilterAboveForEach");
+        r = new FilterAboveForeach("PushUpFilter");
         checkAndAddRule(s, r);
         if (!s.isEmpty())
             ls.add(s);