Author: daijy Date: Tue Aug 31 01:23:16 2010 New Revision: 991052 URL: http://svn.apache.org/viewvc?rev=991052&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=991052&r1=991051&r2=991052&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:23:16 2010 @@ -679,10 +679,15 @@ public static void usage() System.out.println(" -p, -param - Key value pair of the form param=val"); System.out.println(" -r, -dryrun - Produces script with substituted parameters. Script is not executed."); System.out.println(" -t, -optimizer_off - Turn optimizations off. The following values are supported:"); - System.out.println(" PushUpFilter - Filter as early as possible"); + 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(" PushDownForeachFlatten - Join or explode as late as possible"); - System.out.println(" PruneColumns - Remove unused data"); + System.out.println(" ColumnMapKeyPrune - Remove unused data"); System.out.println(" LimitOptimizer - Limit as early as possible"); + System.out.println(" AddForEach - Add ForEach to remove unneeded columns"); + System.out.println(" MergeForEach - Merge adjacent ForEach"); System.out.println(" All - Disable all optimizations"); System.out.println(" All optimizations are enabled by default. Optimization values are case insensitive."); System.out.println(" -v, -verbose - Print all error messages to screen"); 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=991052&r1=991051&r2=991052&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:23:16 2010 @@ -107,7 +107,7 @@ public class LogicalPlanOptimizer extend s = new HashSet<Rule>(); r = new PushUpFilter("PushUpFilter"); checkAndAddRule(s, r); - r = new FilterAboveForeach("FilterAboveForEachWithFlatten"); + r = new FilterAboveForeach("FilterAboveForEach"); checkAndAddRule(s, r); if (!s.isEmpty()) ls.add(s);