You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2011/01/31 23:00:21 UTC

svn commit: r1065818 - in /pig/trunk: ./ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ test/org/apache/pig/test/ test/org/apache/pig/test/data/GoldenFiles/

Author: daijy
Date: Mon Jan 31 22:00:20 2011
New Revision: 1065818

URL: http://svn.apache.org/viewvc?rev=1065818&view=rev
Log:
PIG-1812: Problem with DID_NOT_FIND_LOAD_ONLY_MAP_PLAN

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
    pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java
    pig/trunk/test/org/apache/pig/test/TestMRCompiler.java
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC1.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC10.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC11.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC12.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC13.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC14.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC17.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC19.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC2.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC3.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC5.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC6.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld
    pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jan 31 22:00:20 2011
@@ -284,6 +284,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
 
 BUG FIXES
 
+PIG-1812: Problem with DID_NOT_FIND_LOAD_ONLY_MAP_PLAN (daijy)
+
 PIG-1813: Pig 0.8 throws ERROR 1075 while trying to refer a map in the result
 of eval udf.Works with 0.7 (daijy)
 

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java Mon Jan 31 22:00:20 2011
@@ -31,6 +31,7 @@ import org.apache.pig.backend.hadoop.exe
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POLocalRearrange;
+import org.apache.pig.data.DataType;
 import org.apache.pig.impl.plan.DepthFirstWalker;
 import org.apache.pig.impl.plan.VisitorException;
 
@@ -57,6 +58,10 @@ public class KeyTypeDiscoveryVisitor ext
         if(mr instanceof NativeMapReduceOper) {
             return;
         }
+        if (mr.useSecondaryKey) {
+            mr.mapKeyType = DataType.TUPLE;
+            return;
+        }
         boolean foundKeyType = false;
         PhyPlanKeyTypeVisitor kvisitor = new PhyPlanKeyTypeVisitor(mr.mapPlan, mr);
         kvisitor.visit();

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java Mon Jan 31 22:00:20 2011
@@ -339,28 +339,6 @@ public class MRCompiler extends PhyPlanV
             compile(op);
         }
         
-        // I'm quite certain this is not the best way to do this.  The issue
-        // is that for jobs that take multiple map reduce passes, for
-        // non-sort jobs, the POLocalRearrange is being put into the reduce
-        // of MR job n, with the map for MR job n+1 empty and the POPackage
-        // in reduce of MR job n+1.  This causes problems in the collect of
-        // the map MR job n+1.  To resolve this, the following visitor
-        // walks the resulting compiled jobs, looks for the pattern described
-        // above, and then moves the POLocalRearrange to the map of MR job
-        // n+1.  It seems to me there are two possible better solutions:
-        // 1) Change the logic in this compiler to put POLocalRearrange in
-        // the correct place to begin with instead of patching it up later.
-        // I'd do this but I don't fully understand the logic here and it's
-        // complex.
-        // 2) Change our map reduce execution to have a reduce only mode.  In
-        // this case the map would not even try to parse the input, it would
-        // just be 100% pass through.  I suspect this might be better though
-        // I don't fully understand the consequences of this.
-        // Given these issues, the following works for now, and we can fine
-        // tune it when Shravan returns.
-        RearrangeAdjuster ra = new RearrangeAdjuster(MRPlan);
-        ra.visit();
-        
         connectSoftLink();
         
         LimitAdjuster la = new LimitAdjuster(MRPlan);
@@ -560,6 +538,46 @@ public class MRCompiler extends PhyPlanV
         }
     }
     
+    private void addToMap(PhysicalOperator op) throws PlanException, IOException{
+        
+        if (compiledInputs.length == 1) {
+            //For speed
+            MapReduceOper mro = compiledInputs[0];
+            if (!mro.isMapDone()) {
+                mro.mapPlan.addAsLeaf(op);
+            } else if (mro.isMapDone() && !mro.isReduceDone()) {
+                FileSpec fSpec = getTempFileSpec();
+                
+                POStore st = getStore();
+                st.setSFile(fSpec);
+                mro.reducePlan.addAsLeaf(st);
+                mro.setReduceDone(true);
+                mro = startNew(fSpec, mro);
+                mro.mapPlan.addAsLeaf(op);
+                compiledInputs[0] = mro;
+            } else {
+                int errCode = 2022;
+                String msg = "Both map and reduce phases have been done. This is unexpected while compiling.";                
+                throw new PlanException(msg, errCode, PigException.BUG);
+            }
+            curMROp = mro;
+        } else {
+            List<MapReduceOper> mergedPlans = merge(compiledInputs);
+            
+            //The first MROper is always the merged map MROper
+            MapReduceOper mro = mergedPlans.remove(0);
+            //Push the input operator into the merged map MROper
+            mro.mapPlan.addAsLeaf(op);
+            
+            //Connect all the reduce MROpers
+            if(mergedPlans.size()>0)
+                connRedOper(mergedPlans, mro);
+            
+            //return the compiled MROper
+            curMROp = mro;
+        }
+    }
+    
     /**
      * Used for compiling blocking operators. If there is a single input
      * and its map phase is still open, then close it so that further
@@ -1052,7 +1070,7 @@ public class MRCompiler extends PhyPlanV
     @Override
     public void visitLocalRearrange(POLocalRearrange op) throws VisitorException {
         try{
-            nonBlocking(op);
+            addToMap(op);
             List<PhysicalPlan> plans = op.getPlans();
             if(plans!=null)
                 for(PhysicalPlan ep : plans)
@@ -1826,12 +1844,8 @@ public class MRCompiler extends PhyPlanV
             lr.setPlans(eps);
             lr.setResultType(DataType.TUPLE);
             lr.setDistinct(true);
-            if(!mro.isMapDone()){
-                mro.mapPlan.addAsLeaf(lr);
-            }
-            else if(mro.isMapDone() && ! mro.isReduceDone()){
-                mro.reducePlan.addAsLeaf(lr);
-            }
+            
+            addToMap(lr);
             
             blocking(op);
             
@@ -2794,83 +2808,6 @@ public class MRCompiler extends PhyPlanV
 
     }
     
-    
-    private class RearrangeAdjuster extends MROpPlanVisitor {
-
-        RearrangeAdjuster(MROperPlan plan) {
-            super(plan, new DepthFirstWalker<MapReduceOper, MROperPlan>(plan));
-        }
-
-        @Override
-        public void visitMROp(MapReduceOper mr) throws VisitorException {
-            // Look for map reduce operators whose reduce starts in a local
-            // rearrange.  If it has a successor and that predecessor's map
-            // plan is just a load, push the porearrange to the successor.
-            // Else, throw an error.
-            if (mr.reducePlan.isEmpty()) return;
-            List<PhysicalOperator> mpLeaves = mr.reducePlan.getLeaves();
-            if (mpLeaves.size() != 1) {
-                int errCode = 2024; 
-                String msg = "Expected reduce to have single leaf. Found " + mpLeaves.size() + " leaves.";
-                throw new MRCompilerException(msg, errCode, PigException.BUG);
-            }
-            PhysicalOperator mpLeaf = mpLeaves.get(0);
-            if (!pigContext.inIllustrator)
-            if (!(mpLeaf instanceof POStore)) {
-                int errCode = 2025;
-                String msg = "Expected leaf of reduce plan to " +
-                    "always be POStore. Found " + mpLeaf.getClass().getSimpleName();
-                throw new MRCompilerException(msg, errCode, PigException.BUG);
-            }
-            List<PhysicalOperator> preds =
-                mr.reducePlan.getPredecessors(mpLeaf);
-            if (preds == null) return;
-            if (preds.size() > 1) {
-                int errCode = 2030;
-                String msg ="Expected reduce plan leaf to have a single predecessor. Found " + preds.size() + " predecessors.";
-                throw new MRCompilerException(msg, errCode, PigException.BUG);
-            }
-            PhysicalOperator pred = preds.get(0);
-            if (!(pred instanceof POLocalRearrange)) return;
-
-            // Next question, does the next MROper have an empty map?
-            List<MapReduceOper> succs = mPlan.getSuccessors(mr);
-            if (succs == null) {
-                int errCode = 2031;
-                String msg = "Found map reduce operator with POLocalRearrange as"
-                    + " last oper but with no succesor.";
-                throw new MRCompilerException(msg, errCode, PigException.BUG);
-            }
-            if (succs.size() > 1) {
-                int errCode = 2032;
-                String msg = "Expected map reduce operator to have a single successor. Found " + succs.size() + " successors.";
-                throw new MRCompilerException(msg, errCode, PigException.BUG);
-            }
-            MapReduceOper succ = succs.get(0);
-            List<PhysicalOperator> succMpLeaves = succ.mapPlan.getLeaves();
-            List<PhysicalOperator> succMpRoots = succ.mapPlan.getRoots();
-            if (succMpLeaves == null || succMpLeaves.size() > 1 ||
-                    succMpRoots == null || succMpRoots.size() > 1 ||
-                    succMpLeaves.get(0) != succMpRoots.get(0)) {
-            		messageCollector.collect("Expected to find subsequent map " +
-                    "with just a load, but didn't",
-                    MessageType.Warning, PigWarning.DID_NOT_FIND_LOAD_ONLY_MAP_PLAN);
-                return;
-            }
-            PhysicalOperator load = succMpRoots.get(0);
-
-            try {
-                mr.reducePlan.removeAndReconnect(pred);
-                succ.mapPlan.add(pred);
-                succ.mapPlan.connect(load, pred);
-            } catch (PlanException pe) {
-                int errCode = 2033;
-                String msg = "Problems in rearranging map reduce operators in plan.";
-                throw new MRCompilerException(msg, errCode, PigException.BUG, pe);
-            }
-        }
-    }
-
     private class LimitAdjuster extends MROpPlanVisitor {
         ArrayList<MapReduceOper> opsToAdjust = new ArrayList<MapReduceOper>();  
 

Modified: pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestEvalPipeline2.java Mon Jan 31 22:00:20 2011
@@ -1274,4 +1274,33 @@ public class TestEvalPipeline2 extends T
         assertTrue(t.toString().contains("(2)"));
         assertFalse(iter.hasNext());
     }
+    
+    // See PIG-1812
+    @Test
+    public void testLocalRearrangeInReducer() throws Exception{
+        String[] input1 = {
+                "1\t1",
+                "1\t1",
+                "1\t2",
+        };
+        
+        String[] input2 = {
+                "1\t1",
+        };
+
+        Util.createInputFile(cluster, "table_testLocalRearrangeInReducer1", input1);
+        Util.createInputFile(cluster, "table_testLocalRearrangeInReducer2", input2);
+
+        pigServer.registerQuery("a = load 'table_testLocalRearrangeInReducer1' as (a0, a1);");
+        pigServer.registerQuery("b = distinct a;");
+        pigServer.registerQuery("c = load 'table_testLocalRearrangeInReducer2' as (c0, c1);");
+        pigServer.registerQuery("d = cogroup b by a0, c by c0;");
+        pigServer.registerQuery("e = foreach d { e1 = order c by c1; generate e1;};");
+        
+        Iterator<Tuple> iter = pigServer.openIterator("e");
+        
+        Tuple t = iter.next();
+        assertTrue(t.toString().contains("({(1,1)})"));
+        assertFalse(iter.hasNext());
+    }
 }

Modified: pig/trunk/test/org/apache/pig/test/TestMRCompiler.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestMRCompiler.java?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestMRCompiler.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestMRCompiler.java Mon Jan 31 22:00:20 2011
@@ -53,6 +53,7 @@ import org.apache.pig.backend.hadoop.exe
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.expressionOperators.POProject;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.expressionOperators.POUserComparisonFunc;
 import org.apache.pig.backend.hadoop.executionengine.physicalLayer.expressionOperators.POUserFunc;
+import org.apache.pig.impl.plan.NodeIdGenerator;
 import org.apache.pig.impl.plan.PlanException;
 import org.apache.pig.impl.plan.VisitorException;
 import org.apache.pig.test.TestPOSort.WeirdComparator;
@@ -112,6 +113,7 @@ public class TestMRCompiler extends juni
         GenPhyOp.setR(r);
         
         GenPhyOp.setPc(pc);
+        NodeIdGenerator.getGenerator().reset("");
     }
 
     @Override

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC1.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC1.gld Mon Jan 31 22:00:20 2011
@@ -1,4 +1,4 @@
-MapReduce(-1) - -78:
+MapReduce(-1) - -3:
 |   Store(DummyFil:DummyLdr) - -5515425171581967372
 |   |
 |   |---Filter[tuple] - --6061281703859425960
@@ -8,10 +8,10 @@ MapReduce(-1) - -78:
 |       |---Package[tuple]{Unknown} - --5758282087831209061
 |   Local Rearrange[tuple]{Unknown}(false) - -3709512757404691843
 |   |
-|   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -77
+|   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -2
 |
-|---MapReduce(-1) - -75:
-    |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -76
+|---MapReduce(-1) - -0:
+    |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -1
     |   |
     |   |---Package[tuple]{Unknown} - --2057425961601007773
     |   Local Rearrange[tuple]{Unknown}(false) - --8361563503038121624

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC10.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC10.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC10.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC10.gld Mon Jan 31 22:00:20 2011
@@ -1,15 +1,15 @@
-MapReduce(-1) - -11:
+MapReduce(-1) - -14:
 Reduce Plan Empty
 |   Store(DummyFil:DummyLdr) - -7490898804471997380
 |   |
 |   |---Union[tuple] - -3720949273928245639
 |       |
-|       |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -12
+|       |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -15
 |       |
-|       |---Load(file:/tmp/temp-1456742965/tmp774375955:org.apache.pig.impl.io.InterStorage) - -14
+|       |---Load(file:/tmp/temp-1456742965/tmp774375955:org.apache.pig.impl.io.InterStorage) - -17
 |
 |---MapReduce(-1) - -2:
-|   |   Store(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -13
+|   |   Store(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -16
 |   |   |
 |   |   |---Filter[tuple] - --2449990780759860228
 |   |       |   |
@@ -30,30 +30,32 @@ Reduce Plan Empty
 |   |           |
 |   |           |---Load(DummyFil:DummyLdr) - --3833933141637499382
 |
-|---MapReduce(-1) - -6:
-    |   Store(file:/tmp/temp-1456742965/tmp774375955:org.apache.pig.impl.io.InterStorage) - -15
+|---MapReduce(-1) - -12:
+    |   Store(file:/tmp/temp-1456742965/tmp774375955:org.apache.pig.impl.io.InterStorage) - -18
     |   |
     |   |---Package[tuple]{Unknown} - -5679595123645092366
-    |   Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -7
-    |   
-    |   Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -9
+    |   Union[tuple] - -13
+    |   |
+    |   |---Local Rearrange[tuple]{Unknown}(false) - --8216215966586363937
+    |   |   |
+    |   |   |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -6
+    |   |
+    |   |---Local Rearrange[tuple]{Unknown}(false) - --5623550231721294978
+    |       |
+    |       |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -10
     |
     |---MapReduce(30) - -4:
-    |   |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -8
+    |   |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -5
     |   |   |
-    |   |   |---Local Rearrange[tuple]{Unknown}(false) - --8216215966586363937
-    |   |       |
-    |   |       |---Package[tuple]{Unknown} - --7212359720440714287
+    |   |   |---Package[tuple]{Unknown} - --7212359720440714287
     |   |   Local Rearrange[tuple]{Unknown}(false) - -7469509242284658386
     |   |   |
     |   |   |---Load(DummyFil:DummyLdr) - -990040854696137546
     |
-    |---MapReduce(20) - -5:
-        |   Store(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -10
+    |---MapReduce(20) - -8:
+        |   Store(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -9
         |   |
-        |   |---Local Rearrange[tuple]{Unknown}(false) - --5623550231721294978
-        |       |
-        |       |---Package[tuple]{Unknown} - --6259721534861268730
+        |   |---Package[tuple]{Unknown} - --6259721534861268730
         |   Local Rearrange[tuple]{Unknown}(false) - -3248199015665744565
         |   |
         |   |---Filter[tuple] - -6520791719738296531

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC11.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC11.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC11.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC11.gld Mon Jan 31 22:00:20 2011
@@ -1,22 +1,22 @@
-MapReduce(-1) - -26:
+MapReduce(-1) - -10:
 Reduce Plan Empty
 |   Store(DummyFil:DummyLdr) - -3900012572437255236
 |   |
 |   |---Union[tuple] - -8760996681222683693
 |       |
-|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -27
+|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -11
 |       |
-|       |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -29
+|       |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -13
 |
-|---MapReduce(-1) - -18:
-|   |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -28
+|---MapReduce(-1) - -2:
+|   |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -12
 |   |   |
 |   |   |---Filter[tuple] - -956528893337238225
 |   |       |   |
 |   |       |   Constant(true) - -7391599663069134339
 |   |       |
 |   |       |---Package[tuple]{Unknown} - -4024598850351165272
-|   |   Union[tuple] - -19
+|   |   Union[tuple] - -3
 |   |   |
 |   |   |---Local Rearrange[tuple]{Unknown}(false) - -913150185705910016
 |   |   |   |
@@ -30,13 +30,13 @@ Reduce Plan Empty
 |   |       |
 |   |       |---Load(DummyFil:DummyLdr) - -7577375165361647685
 |
-|---MapReduce(-1) - -22:
-    |   Store(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -30
+|---MapReduce(-1) - -6:
+    |   Store(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -14
     |   |
     |   |---Package[tuple]{Unknown} - -3742910951635599848
-    |   Union[tuple] - -23
+    |   Union[tuple] - -7
     |   |
-    |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -24
+    |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -8
     |   |
     |   |---Local Rearrange[tuple]{Unknown}(false) - -689137294940608050
     |       |
@@ -46,8 +46,8 @@ Reduce Plan Empty
     |           |
     |           |---Load(DummyFil:DummyLdr) - --961974426096759446
     |
-    |---MapReduce(-1) - -20:
-        |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -25
+    |---MapReduce(-1) - -4:
+        |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -9
         |   |
         |   |---Package[tuple]{Unknown} - --5733160635931065595
         |   Local Rearrange[tuple]{Unknown}(false) - --1115934782004129477

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC12.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC12.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC12.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC12.gld Mon Jan 31 22:00:20 2011
@@ -1,8 +1,8 @@
-MapReduce(-1) - -37:
+MapReduce(-1) - -6:
 |   Store(DummyFil:DummyLdr) - --1596982214453270401
 |   |
 |   |---Package[tuple]{Unknown} - -2312201225366906989
-|   Union[tuple] - -38
+|   Union[tuple] - -7
 |   |
 |   |---Local Rearrange[tuple]{Unknown}(false) - --4071762447953696591
 |   |   |
@@ -10,7 +10,7 @@ MapReduce(-1) - -37:
 |   |       |   |
 |   |       |   Constant(true) - -7123161826157220327
 |   |       |
-|   |       |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -33
+|   |       |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -2
 |   |
 |   |---Local Rearrange[tuple]{Unknown}(false) - --3509976263222494134
 |       |
@@ -18,10 +18,10 @@ MapReduce(-1) - -37:
 |           |   |
 |           |   Constant(true) - --5941754500044119766
 |           |
-|           |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -35
+|           |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -4
 |
-|---MapReduce(-1) - -31:
+|---MapReduce(-1) - -0:
     Reduce Plan Empty
-    |   Store(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -32
+    |   Store(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -1
     |   |
     |   |---Load(DummyFil:DummyLdr) - -2626971498845605352
\ No newline at end of file

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC13.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC13.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC13.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC13.gld Mon Jan 31 22:00:20 2011
@@ -1,4 +1,4 @@
-MapReduce(-1) - -52:
+MapReduce(-1) - -13:
 Reduce Plan Empty
 |   Store(DummyFil:DummyLdr) - -6411189422016119355
 |   |
@@ -8,19 +8,19 @@ Reduce Plan Empty
 |       |   |   |
 |       |   |   Constant(true) - --7987250529196129674
 |       |   |
-|       |   |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -48
+|       |   |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -9
 |       |
 |       |---Filter[tuple] - -2056844330428347996
 |           |   |
 |           |   Constant(true) - --8754957318949788629
 |           |
-|           |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -50
+|           |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -11
 |
-|---MapReduce(-1) - -45:
-    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -47
+|---MapReduce(-1) - -6:
+    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -8
     |   |
     |   |---Package[tuple]{Unknown} - --1607475648664293401
-    |   Union[tuple] - -46
+    |   Union[tuple] - -7
     |   |
     |   |---Local Rearrange[tuple]{Unknown}(false) - --3476413267732334825
     |   |   |
@@ -28,7 +28,7 @@ Reduce Plan Empty
     |   |       |   |
     |   |       |   Constant(true) - -3515731110955624708
     |   |       |
-    |   |       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -41
+    |   |       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -2
     |   |
     |   |---Local Rearrange[tuple]{Unknown}(false) - -2351257193210757136
     |       |
@@ -36,10 +36,10 @@ Reduce Plan Empty
     |           |   |
     |           |   Constant(true) - -728209667098611077
     |           |
-    |           |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -43
+    |           |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -4
     |
-    |---MapReduce(-1) - -39:
+    |---MapReduce(-1) - -0:
         Reduce Plan Empty
-        |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -40
+        |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -1
         |   |
         |   |---Load(DummyFil:DummyLdr) - --7797378030368227515
\ No newline at end of file

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC14.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC14.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC14.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC14.gld Mon Jan 31 22:00:20 2011
@@ -1,4 +1,4 @@
-MapReduce(100) - -74:
+MapReduce(100) - -21:
 Reduce Plan Empty
 |   Store(DummyFil:DummyLdr) - -7034055442337723447
 |   |
@@ -8,19 +8,19 @@ Reduce Plan Empty
 |       |   |   |
 |       |   |   Constant(true) - --6380139708906526553
 |       |   |
-|       |   |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -70
+|       |   |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -17
 |       |
 |       |---Filter[tuple] - -2468262982799101733
 |           |   |
 |           |   Constant(true) - -7123718043666602037
 |           |
-|           |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -72
+|           |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -19
 |
-|---MapReduce(40) - -67:
-    |   Store(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -69
+|---MapReduce(40) - -14:
+    |   Store(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -16
     |   |
     |   |---Package[tuple]{Unknown} - --7096529877081178520
-    |   Union[tuple] - -68
+    |   Union[tuple] - -15
     |   |
     |   |---Local Rearrange[tuple]{Unknown}(false) - --7868505214447593853
     |   |   |
@@ -28,7 +28,7 @@ Reduce Plan Empty
     |   |       |   |
     |   |       |   Constant(true) - -8729990799028586395
     |   |       |
-    |   |       |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -58
+    |   |       |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -5
     |   |
     |   |---Local Rearrange[tuple]{Unknown}(false) - --5177745552827005198
     |   |   |
@@ -36,7 +36,7 @@ Reduce Plan Empty
     |   |       |   |
     |   |       |   Constant(true) - --5723332042410534632
     |   |       |
-    |   |       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -63
+    |   |       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -10
     |   |
     |   |---Local Rearrange[tuple]{Unknown}(false) - -1236980712440527800
     |       |
@@ -44,36 +44,36 @@ Reduce Plan Empty
     |           |   |
     |           |   Constant(true) - --6430355428631435461
     |           |
-    |           |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -65
+    |           |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -12
     |
-    |---MapReduce(20) - -56:
+    |---MapReduce(20) - -3:
     |   Reduce Plan Empty
-    |   |   Store(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -57
+    |   |   Store(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -4
     |   |   |
     |   |   |---Filter[tuple] - -5984722006991913573
     |   |       |   |
     |   |       |   Constant(true) - --7231511798448197372
     |   |       |
-    |   |       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -55
+    |   |       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -2
     |   |
-    |   |---MapReduce(-1) - -53:
+    |   |---MapReduce(-1) - -0:
     |       Reduce Plan Empty
-    |       |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -54
+    |       |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -1
     |       |   |
     |       |   |---Load(DummyFil:DummyLdr) - -8816201798088731301
     |
-    |---MapReduce(10) - -61:
+    |---MapReduce(10) - -8:
         Reduce Plan Empty
-        |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -62
+        |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -9
         |   |
         |   |---Filter[tuple] - -8205341881606740757
         |       |   |
         |       |   Constant(true) - --7091196022628815072
         |       |
-        |       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -60
+        |       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -7
         |
-        |---MapReduce(-1) - -53:
+        |---MapReduce(-1) - -0:
             Reduce Plan Empty
-            |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -54
+            |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -1
             |   |
             |   |---Load(DummyFil:DummyLdr) - -8816201798088731301
\ No newline at end of file

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld Mon Jan 31 22:00:20 2011
@@ -1,4 +1,4 @@
-MapReduce(1,GFCross) - -156:
+MapReduce(1,GFCross) - -29:
 |   Store(DummyFil:DummyLdr) - --6405280822876279137
 |   |
 |   |---New For Each(false)[tuple] - -6741648588878535427
@@ -10,10 +10,10 @@ MapReduce(1,GFCross) - -156:
 |       |---Package[tuple]{Unknown} - -6079615556647418436
 |   Local Rearrange[tuple]{Unknown}(false) - -8219725798912083822
 |   |
-|   |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -155
+|   |---Load(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -28
 |
-|---MapReduce(1,AVG) - -153:
-    |   Store(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -154
+|---MapReduce(1,AVG) - -26:
+    |   Store(file:/tmp/temp-1456742965/tmp-586682361:org.apache.pig.impl.io.InterStorage) - -27
     |   |
     |   |---New For Each(false)[tuple] - --2783416442434419494
     |       |   |
@@ -24,10 +24,10 @@ MapReduce(1,GFCross) - -156:
     |       |---Package[tuple]{Unknown} - --1613182091613226659
     |   Local Rearrange[tuple]{Unknown}(false) - -5165956429696944631
     |   |
-    |   |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -152
+    |   |---Load(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -25
     |
-    |---MapReduce(20,SUM,COUNT,TestMRCompiler$WeirdComparator) - -145:
-        |   Store(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -151
+    |---MapReduce(20,SUM,COUNT,TestMRCompiler$WeirdComparator) - -18:
+        |   Store(file:/tmp/temp-1456742965/tmp-26634357:org.apache.pig.impl.io.InterStorage) - -24
         |   |
         |   |---New For Each(false,false)[tuple] - -2197807331204639125
         |       |   |
@@ -39,50 +39,50 @@ MapReduce(1,GFCross) - -156:
         |       |   |
         |       |   |---Project[tuple][*] - -6139496040975471496
         |       |
-        |       |---New For Each(true)[tuple] - -150
+        |       |---New For Each(true)[tuple] - -23
         |           |   |
-        |           |   Project[bag][1] - -149
+        |           |   Project[bag][1] - -22
         |           |
-        |           |---PackageLite[tuple]{tuple} - -148
-        |   Local Rearrange[tuple]{tuple}(false) - -147
+        |           |---PackageLite[tuple]{tuple} - -21
+        |   Local Rearrange[tuple]{tuple}(false) - -20
         |   |   |
-        |   |   Project[tuple][*] - -146
+        |   |   Project[tuple][*] - -19
         |   |
-        |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -144
+        |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -17
         |
-        |---MapReduce(1,TestMRCompiler$WeirdComparator) - -130:
-            |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -143
+        |---MapReduce(1,TestMRCompiler$WeirdComparator) - -3:
+            |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -16
             |   |
-            |   |---New For Each(false)[tuple] - -142
+            |   |---New For Each(false)[tuple] - -15
             |       |   |
-            |       |   POUserFunc(org.apache.pig.impl.builtin.FindQuantiles)[tuple] - -141
+            |       |   POUserFunc(org.apache.pig.impl.builtin.FindQuantiles)[tuple] - -14
             |       |   |
-            |       |   |---Project[tuple][*] - -140
+            |       |   |---Project[tuple][*] - -13
             |       |
-            |       |---New For Each(false,false)[tuple] - -139
+            |       |---New For Each(false,false)[tuple] - -12
             |           |   |
-            |           |   Constant(20) - -138
+            |           |   Constant(20) - -11
             |           |   |
             |           |   POSort[bag](org.apache.pig.test.TestMRCompiler$WeirdComparator) - -4188863770717253580
             |           |   |   |
-            |           |   |   Project[tuple][*] - -137
+            |           |   |   Project[tuple][*] - -10
             |           |   |
-            |           |   |---Project[tuple][1] - -136
+            |           |   |---Project[tuple][1] - -9
             |           |
-            |           |---Package[tuple]{chararray} - -135
-            |   Local Rearrange[tuple]{chararray}(false) - -134
+            |           |---Package[tuple]{chararray} - -8
+            |   Local Rearrange[tuple]{chararray}(false) - -7
             |   |   |
-            |   |   Constant(all) - -133
+            |   |   Constant(all) - -6
             |   |
-            |   |---New For Each(true)[tuple] - -132
+            |   |---New For Each(true)[tuple] - -5
             |       |   |
-            |       |   Project[tuple][*] - -131
+            |       |   Project[tuple][*] - -4
             |       |
-            |       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.builtin.RandomSampleLoader('org.apache.pig.impl.io.InterStorage','100')) - -129
+            |       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.builtin.RandomSampleLoader('org.apache.pig.impl.io.InterStorage','100')) - -2
             |
-            |---MapReduce(-1) - -127:
+            |---MapReduce(-1) - -0:
                 Reduce Plan Empty
-                |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -128
+                |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -1
                 |   |
                 |   |---Filter[tuple] - -2082992246427879202
                 |       |   |

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld Mon Jan 31 22:00:20 2011
@@ -1,36 +1,36 @@
-MapReduce(-1) - -170:
+MapReduce(-1) - -13:
 |   Store(DummyFil:DummyLdr) - --696216369324861973
 |   |
-|   |---New For Each(true)[bag] - -173
+|   |---New For Each(true)[bag] - -16
 |       |   |
-|       |   Project[tuple][0] - -172
+|       |   Project[tuple][0] - -15
 |       |
-|       |---Package[tuple]{tuple} - -171
-|   Local Rearrange[tuple]{tuple}(true) - -167
+|       |---Package[tuple]{tuple} - -14
+|   Local Rearrange[tuple]{tuple}(true) - -10
 |   |   |
-|   |   Project[tuple][*] - -166
+|   |   Project[tuple][*] - -9
 |   |
-|   |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -169
+|   |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -12
 |
-|---MapReduce(-1) - -165:
-    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -168
+|---MapReduce(-1) - -8:
+    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -11
     |   |
     |   |---Package[tuple]{Unknown} - -2975419344702132532
     |   Local Rearrange[tuple]{Unknown}(false) - -6555138338004402415
     |   |
-    |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -164
+    |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -7
     |
-    |---MapReduce(-1) - -157:
-        |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -163
+    |---MapReduce(-1) - -0:
+        |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -6
         |   |
-        |   |---New For Each(true)[bag] - -162
+        |   |---New For Each(true)[bag] - -5
         |       |   |
-        |       |   Project[tuple][0] - -161
+        |       |   Project[tuple][0] - -4
         |       |
-        |       |---Package[tuple]{tuple} - -160
-        |   Local Rearrange[tuple]{tuple}(true) - -159
+        |       |---Package[tuple]{tuple} - -3
+        |   Local Rearrange[tuple]{tuple}(true) - -2
         |   |   |
-        |   |   Project[tuple][*] - -158
+        |   |   Project[tuple][*] - -1
         |   |
         |   |---Filter[tuple] - --8322891634142946616
         |       |   |

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC17.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC17.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC17.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC17.gld Mon Jan 31 22:00:20 2011
@@ -1,16 +1,16 @@
-MapReduce(1) - -174:
+MapReduce(1) - -0:
 |   Store(DummyFil:DummyLdr) - -3851605818031718348
 |   |
-|   |---Limit - -180
+|   |---Limit - -6
 |       |
-|       |---New For Each(true)[bag] - -179
+|       |---New For Each(true)[bag] - -5
 |           |   |
-|           |   Project[tuple][1] - -178
+|           |   Project[tuple][1] - -4
 |           |
-|           |---Package[tuple]{tuple} - -177
-|   Local Rearrange[tuple]{tuple}(false) - -176
+|           |---Package[tuple]{tuple} - -3
+|   Local Rearrange[tuple]{tuple}(false) - -2
 |   |   |
-|   |   Project[tuple][*] - -175
+|   |   Project[tuple][*] - -1
 |   |
 |   |---Limit - --8049873144002881309
 |       |

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld Mon Jan 31 22:00:20 2011
@@ -18,4 +18,4 @@ Reduce Plan Empty
     |   |   |
     |   |   Project[tuple][*] - scope-126
     |   |
-    |   |---b: Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihaaaaaaaabhhaeaaaaaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaaaaaaaaaaaaaabacaaacfkaaangfgogeepggebgmgmejgohahfheemaaafgphagngbhaheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlhihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgoeaondlnechegpmlgacaaaiemaaakgneghcgpgnefgeghgfhdhbaahoaaademaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaognfdgpggheeghcgpgnefgeghgfhdhbaahoaaademaaamgnfdgpgghefegpefgeghgfhdhbaahoaaademaaaignfegpefgeghgfhdhbaahoaaad
 hihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhaaaaaaaaaaaaaaaacacaaabemaaaegnengbhahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaaaaaaaaaaaaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaaaaaaaaaaaaaahhheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaaaaaaaaaaaaaabacaaaffkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghfkaaaehdhegbhcemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhedlhihcaagcgphcghcogbhagbgdgigfcohagjghcogcg
 bgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaadgmgpghheaacaemgphcghcpgbhagbgdgigfcpgdgpgngngpgohdcpgmgpghghgjgoghcpemgpghdlhihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaaaaaaaaaaaaaabacaaamfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaadgmgpghhbaahoaabeemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgo
 gfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfagmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapaaaappppppppdchahahahahdhcaaclgphcghcogbhagbgdgigfcogdgpgngngpgohdcogmgpghghgjgoghcogjgnhagmcoemgpghdeekemgpghghgfhccikmpnoicknfncdiacaaabemaaaegogbgngfhbaahoaaaohihaheaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdhehahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaaaaaaaaaaaaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdh
 fgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachahbaahoaaboaaaaaaaahdhbaahoaaaaaaaaaaabhhaeaaaaaaabhdhcaabbgkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailacaaaahihaaaaaaaaahihihdhbaahoaaaaaaaaaaabhhaeaaaaaaakhbaahoaabmhihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhbaahoaabmhbaahoaaaphihdhbaahoaaaaaaaaaaaahhaeaaaaaaakhihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahiaahahi','','b','scope','true')) - scope-117
+    |   |---b: Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihaaaaaaaabhhaeaaaaaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaaaaaaaaaaaaaabacaaacfkaaangfgogeepggebgmgmejgohahfheemaaafgphagngbhaheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlhihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgoeaondlnechegpmlgacaaaiemaaakgneghcgpgnefgeghgfhdhbaahoaaademaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaognfdgpggheeghcgpgnefgeghgfhdhbaahoaaademaaamgnfdgpgghefegpefgeghgfhdhbaahoaaademaaaignfegpefgeghgfhdhbaahoaaad
 hihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhaaaaaaaaaaaaaaaacacaaabemaaaegnengbhahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaaaaaaaaaaaaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaaaaaaaaaaaaaahhheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaaaaaaaaaaaaaabacaaaffkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghfkaaaehdhegbhcemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhedlhihcaagcgphcghcogbhagbgdgigfcohagjghcogcg
 bgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaadgmgpghheaacaemgphcghcpgbhagbgdgigfcpgdgpgngngpgohdcpgmgpghghgjgoghcpemgpghdlhihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaaaaaaaaaaaaaabacaaamfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaadgmgpghhbaahoaabeemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgo
 gfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfagmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapaaaappppppppdchahahahahdhcaaclgphcghcogbhagbgdgigfcogdgpgngngpgohdcogmgpghghgjgoghcogjgnhagmcoemgpghdeekemgpghghgfhccikmpnoicknfncdiacaaabemaaaegogbgngfhbaahoaaaohihaheaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdhehahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaaaaaaaaaaaaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdh
 fgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachahbaahoaaboaaaaaaaahdhbaahoaaaaaaaaaaabhhaeaaaaaaabhdhcaabbgkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailacaaaahihaaaaaaaaahihihdhbaahoaaaaaaaaaaabhhaeaaaaaaakhbaahoaabmhihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhbaahoaabmhbaahoaaaphihdhbaahoaaaaaaaaaaaahhaeaaaaaaakhihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahiaahahi','','b','scope','true')) - scope-117
\ No newline at end of file

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC19.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC19.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC19.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC19.gld Mon Jan 31 22:00:20 2011
@@ -1,4 +1,4 @@
-MapReduce(1) - -181:
+MapReduce(1) - -0:
 |   Store(DummyFil:DummyLdr) - -3088212343542276753
 |   |
 |   |---New For Each(false)[tuple] - --274910157919533456

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC2.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC2.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC2.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC2.gld Mon Jan 31 22:00:20 2011
@@ -1,23 +1,23 @@
-MapReduce(-1) - -81:
+MapReduce(-1) - -2:
 Reduce Plan Empty
 |   Store(DummyFil:DummyLdr) - --2626287810923037076
 |   |
 |   |---Union[tuple] - --5768272326302808468
 |       |
-|       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -82
+|       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -3
 |       |
-|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -84
+|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -5
 |
-|---MapReduce(-1) - -79:
-|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -83
+|---MapReduce(-1) - -0:
+|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -4
 |   |   |
 |   |   |---Package[tuple]{Unknown} - --2829086180578157275
 |   |   Local Rearrange[tuple]{Unknown}(false) - -6435233330554227045
 |   |   |
 |   |   |---Load(DummyFil:DummyLdr) - --4168060277593001906
 |
-|---MapReduce(-1) - -80:
-    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -85
+|---MapReduce(-1) - -1:
+    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -6
     |   |
     |   |---Package[tuple]{Unknown} - -7483213803049293823
     |   Local Rearrange[tuple]{Unknown}(false) - --5190071275724378681

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC3.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC3.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC3.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC3.gld Mon Jan 31 22:00:20 2011
@@ -1,4 +1,4 @@
-MapReduce(-1) - -89:
+MapReduce(-1) - -3:
 Reduce Plan Empty
 |   Store(DummyFil:DummyLdr) - -3719468117239527682
 |   |
@@ -10,20 +10,20 @@ Reduce Plan Empty
 |       |   |
 |       |   |---Load(DummyFil:DummyLdr) - --4776862487779398064
 |       |
-|       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -90
+|       |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -4
 |       |
-|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -92
+|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -6
 |
-|---MapReduce(-1) - -86:
-|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -91
+|---MapReduce(-1) - -0:
+|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -5
 |   |   |
 |   |   |---Package[tuple]{Unknown} - --3671186819751472084
 |   |   Local Rearrange[tuple]{Unknown}(false) - -3737603423295312892
 |   |   |
 |   |   |---Load(DummyFil:DummyLdr) - --5123390619301085966
 |
-|---MapReduce(-1) - -88:
-    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -93
+|---MapReduce(-1) - -2:
+    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -7
     |   |
     |   |---Package[tuple]{Unknown} - --2325244147060806375
     |   Local Rearrange[tuple]{Unknown}(false) - --1194577301115518934

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC5.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC5.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC5.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC5.gld Mon Jan 31 22:00:20 2011
@@ -1,4 +1,4 @@
-MapReduce(-1) - -96:
+MapReduce(-1) - -2:
 Reduce Plan Empty
 |   Store(DummyFil:DummyLdr) - -7127277012934370361
 |   |

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC6.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC6.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC6.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC6.gld Mon Jan 31 22:00:20 2011
@@ -1,27 +1,29 @@
-MapReduce(-1) - -99:
+MapReduce(-1) - -8:
 |   Store(DummyFil:DummyLdr) - -8554221887998033529
 |   |
 |   |---Package[tuple]{Unknown} - -5969405952749301492
-|   Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -100
-|   
-|   Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -102
+|   Union[tuple] - -9
+|   |
+|   |---Local Rearrange[tuple]{Unknown}(false) - --203604194309414000
+|   |   |
+|   |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -2
+|   |
+|   |---Local Rearrange[tuple]{Unknown}(false) - -8515950928528386562
+|       |
+|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -6
 |
-|---MapReduce(-1) - -97:
-|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -101
+|---MapReduce(-1) - -0:
+|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -1
 |   |   |
-|   |   |---Local Rearrange[tuple]{Unknown}(false) - --203604194309414000
-|   |       |
-|   |       |---Package[tuple]{Unknown} - --2216790928607759809
+|   |   |---Package[tuple]{Unknown} - --2216790928607759809
 |   |   Local Rearrange[tuple]{Unknown}(false) - -7219092146411102494
 |   |   |
 |   |   |---Load(DummyFil:DummyLdr) - -4266652190633805129
 |
-|---MapReduce(-1) - -98:
-    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -103
+|---MapReduce(-1) - -4:
+    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -5
     |   |
-    |   |---Local Rearrange[tuple]{Unknown}(false) - -8515950928528386562
-    |       |
-    |       |---Package[tuple]{Unknown} - -8957152010410190649
+    |   |---Package[tuple]{Unknown} - -8957152010410190649
     |   Local Rearrange[tuple]{Unknown}(false) - --2465563180022385815
     |   |
     |   |---Load(DummyFil:DummyLdr) - --506205335735031954
\ No newline at end of file

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld Mon Jan 31 22:00:20 2011
@@ -1,8 +1,12 @@
-MapReduce(-1) - -107:
+MapReduce(-1) - -9:
 |   Store(DummyFil:DummyLdr) - --6047015131487356012
 |   |
 |   |---Package[tuple]{Unknown} - --2771799342014688397
-|   Union[tuple] - -108
+|   Union[tuple] - -10
+|   |
+|   |---Local Rearrange[tuple]{Unknown}(false) - --4160312061837144266
+|   |   |
+|   |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -2
 |   |
 |   |---Filter[tuple] - --1524666447399813617
 |   |   |   |
@@ -10,26 +14,22 @@ MapReduce(-1) - -107:
 |   |   |
 |   |   |---Load(DummyFil:DummyLdr) - -7955165653808522445
 |   |
-|   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -109
-|   |
-|   |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -111
+|   |---Local Rearrange[tuple]{Unknown}(false) - -4636081797237532954
+|       |
+|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -7
 |
-|---MapReduce(-1) - -104:
-|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -110
+|---MapReduce(-1) - -0:
+|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -1
 |   |   |
-|   |   |---Local Rearrange[tuple]{Unknown}(false) - --4160312061837144266
-|   |       |
-|   |       |---Package[tuple]{Unknown} - --8706893458091286727
+|   |   |---Package[tuple]{Unknown} - --8706893458091286727
 |   |   Local Rearrange[tuple]{Unknown}(false) - -6693653468874366867
 |   |   |
 |   |   |---Load(DummyFil:DummyLdr) - --3347320220748403847
 |
-|---MapReduce(-1) - -106:
-    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -112
+|---MapReduce(-1) - -5:
+    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -6
     |   |
-    |   |---Local Rearrange[tuple]{Unknown}(false) - -4636081797237532954
-    |       |
-    |       |---Package[tuple]{Unknown} - -2997708366016271267
+    |   |---Package[tuple]{Unknown} - -2997708366016271267
     |   Local Rearrange[tuple]{Unknown}(false) - --1195368474144577564
     |   |
     |   |---Load(DummyFil:DummyLdr) - -3615014757987062850
\ No newline at end of file

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld Mon Jan 31 22:00:20 2011
@@ -1,8 +1,8 @@
-MapReduce(-1) - -117:
+MapReduce(-1) - -10:
 |   Store(DummyFil:DummyLdr) - --2711892325794580872
 |   |
 |   |---Package[tuple]{Unknown} - --776319888013965510
-|   Union[tuple] - -118
+|   Union[tuple] - -11
 |   |
 |   |---Filter[tuple] - --4867358672373443663
 |   |   |   |
@@ -16,26 +16,26 @@ MapReduce(-1) - -117:
 |   |   |
 |   |   |---Load(DummyFil:DummyLdr) - -4589138876054328603
 |   |
-|   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -119
+|   |---Local Rearrange[tuple]{Unknown}(false) - --1848504978980807369
+|   |   |
+|   |   |---Load(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -4
 |   |
-|   |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -121
+|   |---Local Rearrange[tuple]{Unknown}(false) - -4744867519639813717
+|       |
+|       |---Load(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -8
 |
-|---MapReduce(-1) - -115:
-|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -120
+|---MapReduce(-1) - -2:
+|   |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - -3
 |   |   |
-|   |   |---Local Rearrange[tuple]{Unknown}(false) - --1848504978980807369
-|   |       |
-|   |       |---Package[tuple]{Unknown} - --8479692259657755370
+|   |   |---Package[tuple]{Unknown} - --8479692259657755370
 |   |   Local Rearrange[tuple]{Unknown}(false) - -9193928674704944093
 |   |   |
 |   |   |---Load(DummyFil:DummyLdr) - --4238531569995320849
 |
-|---MapReduce(-1) - -116:
-    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -122
+|---MapReduce(-1) - -6:
+    |   Store(file:/tmp/temp-1456742965/tmp2077335416:org.apache.pig.impl.io.InterStorage) - -7
     |   |
-    |   |---Local Rearrange[tuple]{Unknown}(false) - -4744867519639813717
-    |       |
-    |       |---Package[tuple]{Unknown} - -8767305735755351861
+    |   |---Package[tuple]{Unknown} - -8767305735755351861
     |   Local Rearrange[tuple]{Unknown}(false) - -5965044993061572808
     |   |
     |   |---Load(DummyFil:DummyLdr) - -8914265632748254170
\ No newline at end of file

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld?rev=1065818&r1=1065817&r2=1065818&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld Mon Jan 31 22:00:20 2011
@@ -1,8 +1,8 @@
-MapReduce(-1) - -125:
+MapReduce(-1) - -2:
 |   Store(DummyFil:DummyLdr) - --3148893660811981376
 |   |
 |   |---Package[tuple]{Unknown} - --3359714221559579809
-|   Union[tuple] - -126
+|   Union[tuple] - -3
 |   |
 |   |---Filter[tuple] - -727770031531364881
 |   |   |   |