svn commit: r739829 - in /hadoop/pig/trunk: CHANGES.txt src/org/apache/pig/impl/logicalLayer/optimizer/OpLimitOptimizer.java

[daijy]

Author: daijy
Date: Sun Feb  1 20:37:39 2009
New Revision: 739829

URL: http://svn.apache.org/viewvc?rev=739829&view=rev
Log:
PIG-642: Limit after FRJ causes problems

Modified:
    hadoop/pig/trunk/CHANGES.txt
    
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/OpLimitOptimizer.java

Modified: hadoop/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=739829&r1=739828&r2=739829&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Sun Feb  1 20:37:39 2009
@@ -404,3 +404,5 @@
 
     PIG-560: UTFDataFormatException (encoded string too long) is thrown when
     storing strings > 65536 bytes (in UTF8 form) using BinStorage() (sms)
+
+    PIG-642: Limit after FRJ causes problems (daijy)

Modified: 
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/OpLimitOptimizer.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/OpLimitOptimizer.java?rev=739829&r1=739828&r2=739829&view=diff
==============================================================================
--- 
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/OpLimitOptimizer.java
 (original)
+++ 
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/optimizer/OpLimitOptimizer.java
 Sun Feb  1 20:37:39 2009
@@ -35,6 +35,7 @@
 import org.apache.pig.impl.logicalLayer.LOSplit;
 import org.apache.pig.impl.logicalLayer.LOSplitOutput;
 import org.apache.pig.impl.logicalLayer.LOUnion;
+import org.apache.pig.impl.logicalLayer.LOFRJoin;
 import org.apache.pig.impl.logicalLayer.LogicalOperator;
 import org.apache.pig.impl.logicalLayer.LogicalPlan;
 import org.apache.pig.impl.plan.DepthFirstWalker;
@@ -127,7 +128,7 @@
             // Limit cannot be pushed up
             if (predecessor instanceof LOCogroup || predecessor instanceof 
LOFilter ||
                        predecessor instanceof LOLoad || predecessor instanceof 
LOSplit ||
-                       predecessor instanceof LOSplitOutput || predecessor 
instanceof LODistinct)
+                       predecessor instanceof LOSplitOutput || predecessor 
instanceof LODistinct || predecessor instanceof LOFRJoin)
             {
                return;
             }