pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rd...@apache.org
Subject svn commit: r943945 - in /hadoop/pig/trunk: ./ src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/ src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/ src/org/apache/pig/impl/logicalLayer/ src/org/apache/pi...
Date Thu, 13 May 2010 17:28:07 GMT
Author: rding
Date: Thu May 13 17:28:06 2010
New Revision: 943945

URL: http://svn.apache.org/viewvc?rev=943945&view=rev
Log:
PIG-1408: Annotate explain plans with aliases

Modified:
    hadoop/pig/trunk/CHANGES.txt
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrangeForIllustrate.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCross.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LODistinct.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLimit.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStore.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStream.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOUnion.java
    hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java
    hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java
    hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java
    hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplitOutput.java
    hadoop/pig/trunk/test/org/apache/pig/test/TestLogToPhyCompiler.java
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld
    hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld

Modified: hadoop/pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Thu May 13 17:28:06 2010
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
 
 IMPROVEMENTS
 
+PIG-1408: Annotate explain plans with aliases (rding)
+
 PIG-1410: Make PigServer can handle files with parameters (zjffdu)
 
 PIG-1406: Allow to run shell commands from grunt (zjffdu)

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java Thu May 13 17:28:06 2010
@@ -169,6 +169,10 @@ public abstract class PhysicalOperator e
         return alias;
     }
     
+    protected String getAliasString() {
+        return (alias == null) ? "" : (alias + ": ");
+    }
+    
     public void setAlias(String alias) {
         this.alias = alias;
     }

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java Thu May 13 17:28:06 2010
@@ -96,8 +96,10 @@ public class POCollectedGroup extends Ph
 
     @Override
     public String name() {
-        return "Map side group " + "[" + DataType.findTypeName(resultType) +
-            "]" + "{" + DataType.findTypeName(keyType) + "}" + " - " + mKey.toString();
+        return getAliasString() + "Map side group " + "["
+                + DataType.findTypeName(resultType) + "]" + "{"
+                + DataType.findTypeName(keyType) + "}" + " - "
+                + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java Thu May 13 17:28:06 2010
@@ -144,7 +144,7 @@ public class PODemux extends PhysicalOpe
 
     @Override
     public String name() {
-        return "Demux [" + myPlans.size() + "] "+ mKey.toString();
+        return getAliasString() + "Demux [" + myPlans.size() + "] "+ mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java Thu May 13 17:28:06 2010
@@ -124,7 +124,9 @@ public class PODistinct extends Physical
 
     @Override
     public String name() {
-        return "PODistinct" + "[" + DataType.findTypeName(resultType) + "]" +" - " + mKey.toString();
+        return getAliasString() + "PODistinct" + "["
+                + DataType.findTypeName(resultType) + "]" + " - "
+                + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java Thu May 13 17:28:06 2010
@@ -190,8 +190,8 @@ public class POFRJoin extends PhysicalOp
 
     @Override
     public String name() {
-        return "FRJoin[" + DataType.findTypeName(resultType) + "]" + " - "
-                + mKey.toString();
+        return getAliasString() + "FRJoin[" + DataType.findTypeName(resultType)
+                + "]" + " - " + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java Thu May 13 17:28:06 2010
@@ -164,7 +164,9 @@ public class POFilter extends PhysicalOp
 
     @Override
     public String name() {
-        return "Filter" + "[" + DataType.findTypeName(resultType) + "]" + " - " + mKey.toString();
+        return getAliasString() + "Filter" + "["
+                + DataType.findTypeName(resultType) + "]" + " - "
+                + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java Thu May 13 17:28:06 2010
@@ -123,9 +123,10 @@ public class POForEach extends PhysicalO
     }
 
     @Override
-    public String name() {
-        String fString = getFlatStr();
-        return "New For Each" + "(" + fString + ")" + "[" + DataType.findTypeName(resultType) + "]" +" - " + mKey.toString();
+    public String name() {      
+        return getAliasString() + "New For Each" + "(" + getFlatStr() + ")" + "["
+                + DataType.findTypeName(resultType) + "]" + " - "
+                + mKey.toString();
     }
     
     String getFlatStr() {
@@ -622,6 +623,7 @@ public class POForEach extends PhysicalO
                 requestedParallelism, plans, flattens);
         clone.setOpsToBeReset(ops);
         clone.setResultType(getResultType());
+        clone.setAlias(alias);
         return clone;
     }
 

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java Thu May 13 17:28:06 2010
@@ -67,7 +67,9 @@ public class POGlobalRearrange extends P
 
     @Override
     public String name() {
-        return "Global Rearrange" + "[" + DataType.findTypeName(resultType) + "]" +" - " + mKey.toString();
+        return getAliasString() + "Global Rearrange" + "["
+                + DataType.findTypeName(resultType) + "]" + " - "
+                + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java Thu May 13 17:28:06 2010
@@ -99,7 +99,7 @@ public class POLimit extends PhysicalOpe
 
     @Override
     public String name() {
-        return "Limit - " + mKey.toString();
+        return getAliasString() + "Limit - " + mKey.toString();
     }
 
     @Override
@@ -128,6 +128,7 @@ public class POLimit extends PhysicalOpe
             NodeIdGenerator.getGenerator().getNextNodeId(this.mKey.scope)),
             this.requestedParallelism, this.inputs);
         newLimit.mLimit = this.mLimit;
+        newLimit.setAlias(alias);
         return newLimit;
     }
 }

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java Thu May 13 17:28:06 2010
@@ -148,10 +148,9 @@ public class POLoad extends PhysicalOper
 
     @Override
     public String name() {
-        if(lFile!=null)
-            return "Load" + "(" + lFile.toString() + ")" + " - " + mKey.toString();
-        else
-            return "Load" + "(" + "DummyFil:DummyLdr" + ")" + " - " + mKey.toString();
+        return (lFile != null) ? getAliasString() + "Load" + "(" + lFile.toString()
+                + ")" + " - " + mKey.toString() : getAliasString() + "Load" + "("
+                + "DummyFil:DummyLdr" + ")" + " - " + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java Thu May 13 17:28:06 2010
@@ -154,9 +154,10 @@ public class POLocalRearrange extends Ph
 
     @Override
     public String name() {
-        return "Local Rearrange" + "[" + DataType.findTypeName(resultType) +
-            "]" + "{" + DataType.findTypeName(keyType) + "}" + "(" +
-            mIsDistinct + ") - " + mKey.toString();
+        return getAliasString() + "Local Rearrange" + "["
+                + DataType.findTypeName(resultType) + "]" + "{"
+                + DataType.findTypeName(keyType) + "}" + "(" + mIsDistinct
+                + ") - " + mKey.toString();
     }
 
     @Override
@@ -682,6 +683,7 @@ public class POLocalRearrange extends Ph
         // Needs to be called as setDistinct so that the fake index tuple gets
         // created.
         clone.setDistinct(mIsDistinct);
+        clone.setAlias(alias);
         return clone;
     }
 

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrangeForIllustrate.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrangeForIllustrate.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrangeForIllustrate.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrangeForIllustrate.java Thu May 13 17:28:06 2010
@@ -71,9 +71,10 @@ public class POLocalRearrangeForIllustra
 
     @Override
     public String name() {
-        return "Local Rearrange For Illustrate" + "[" + DataType.findTypeName(resultType) +
-            "]" + "{" + DataType.findTypeName(keyType) + "}" + "(" +
-            mIsDistinct + ") - " + mKey.toString();
+        return getAliasString() + "Local Rearrange For Illustrate" + "["
+                + DataType.findTypeName(resultType) + "]" + "{"
+                + DataType.findTypeName(keyType) + "}" + "(" + mIsDistinct
+                + ") - " + mKey.toString();
     }
 
     protected Tuple constructLROutput(List<Result> resLst, List<Result> secondaryResLst, Tuple value) throws ExecException{

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java Thu May 13 17:28:06 2010
@@ -472,7 +472,9 @@ public class POMergeCogroup extends Phys
 
     @Override
     public String name() {
-        return "MergeCogroup[" + DataType.findTypeName(resultType) + "]" +" - " + mKey.toString();
+        return getAliasString() + "MergeCogroup["
+                + DataType.findTypeName(resultType) + "]" + " - "
+                + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java Thu May 13 17:28:06 2010
@@ -507,25 +507,17 @@ public class POMergeJoin extends Physica
         return (List<PhysicalPlan>)inpPlans.get(inputs.get(index));
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.pig.backend.hadoop.executionengine.physicalLayer.PhysicalOperator#visit(org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor)
-     */
     @Override
     public void visit(PhyPlanVisitor v) throws VisitorException {
         v.visitMergeJoin(this);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.pig.impl.plan.Operator#name()
-     */
     @Override
     public String name() {
-        return "MergeJoin[" + DataType.findTypeName(resultType) + "]" +" - " + mKey.toString();
+        return getAliasString() + "MergeJoin[" + DataType.findTypeName(resultType)
+                + "]" + " - " + mKey.toString();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.pig.impl.plan.Operator#supportsMultipleInputs()
-     */
     @Override
     public boolean supportsMultipleInputs() {
         return true;

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java Thu May 13 17:28:06 2010
@@ -140,7 +140,10 @@ public class POPackage extends PhysicalO
 
     @Override
     public String name() {
-        return "Package" + "[" + DataType.findTypeName(resultType) + "]" + "{" + DataType.findTypeName(keyType) + "}" +" - " + mKey.toString();
+        return getAliasString() + "Package" + "["
+                + DataType.findTypeName(resultType) + "]" + "{"
+                + DataType.findTypeName(keyType) + "}" + " - "
+                + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java Thu May 13 17:28:06 2010
@@ -101,9 +101,10 @@ public class POPartitionRearrange extend
 
     @Override
     public String name() {
-        return "Partition rearrange " + "[" + DataType.findTypeName(resultType) +
-            "]" + "{" + DataType.findTypeName(keyType) + "}" + "(" +
-            mIsDistinct + ") - " + mKey.toString();
+        return getAliasString() + "Partition rearrange " + "["
+                + DataType.findTypeName(resultType) + "]" + "{"
+                + DataType.findTypeName(keyType) + "}" + "(" + mIsDistinct
+                + ") - " + mKey.toString();
     }
 
     /**

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java Thu May 13 17:28:06 2010
@@ -89,8 +89,9 @@ public class POPreCombinerLocalRearrange
 
     @Override
     public String name() {
-        return "Pre Combiner Local Rearrange" + "[" + DataType.findTypeName(resultType) +
-            "]" + "{" + DataType.findTypeName(keyType) + "} - " + mKey.toString();
+        return getAliasString() + "Pre Combiner Local Rearrange" + "["
+                + DataType.findTypeName(resultType) + "]" + "{"
+                + DataType.findTypeName(keyType) + "} - " + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java Thu May 13 17:28:06 2010
@@ -96,10 +96,12 @@ public class POSkewedJoin extends Physic
 		v.visitSkewedJoin(this);
 	}
 
-	@Override
-	public String name() {
-		return "SkewedJoin[" + DataType.findTypeName(resultType) + "]" +" - " + mKey.toString();
-	}
+    @Override
+    public String name() {
+        return getAliasString() + "SkewedJoin["
+                + DataType.findTypeName(resultType) + "]" + " - "
+                + mKey.toString();
+    }
 
 	@Override
 	public boolean supportsMultipleInputs() {		

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java Thu May 13 17:28:06 2010
@@ -246,11 +246,13 @@ public class POSort extends PhysicalOper
 
 	}
 
-	@Override
-	public String name() {
-
-		return "POSort" + "[" + DataType.findTypeName(resultType) + "]" + "(" + (mSortFunc!=null?mSortFunc.getFuncSpec():"") + ")" +" - " + mKey.toString();
-	}
+    @Override
+    public String name() {
+        return getAliasString() + "POSort" + "["
+                + DataType.findTypeName(resultType) + "]" + "("
+                + (mSortFunc != null ? mSortFunc.getFuncSpec() : "") + ")"
+                + " - " + mKey.toString();
+    }
 
 	@Override
 	public boolean isBlocking() {

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java Thu May 13 17:28:06 2010
@@ -142,7 +142,7 @@ public class POSplit extends PhysicalOpe
 
     @Override
     public String name() {
-        return "Split - " + mKey.toString();
+        return getAliasString() + "Split - " + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java Thu May 13 17:28:06 2010
@@ -155,10 +155,10 @@ public class POStore extends PhysicalOpe
 
     @Override
     public String name() {
-        if(sFile!=null)
-            return "Store" + "(" + sFile.toString() + ")" + " - " + mKey.toString();
-        else
-            return "Store" + "(" + "DummyFil:DummyLdr" + ")" + " - " + mKey.toString();
+        return (sFile != null) ? getAliasString() + "Store" + "("
+                + sFile.toString() + ")" + " - " + mKey.toString()
+                : getAliasString() + "Store" + "(" + "DummyFil:DummyLdr" + ")"
+                        + " - " + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java Thu May 13 17:28:06 2010
@@ -303,37 +303,26 @@ public class POStream extends PhysicalOp
     }
     
     public String toString() {
-        return "POStream" + "[" + command.toString() + "]" + " - " + mKey.toString();
+        return getAliasString() + "POStream" + "[" + command.toString() + "]"
+                + " - " + mKey.toString();
     }
-    
-    /* (non-Javadoc)
-     * @see org.apache.pig.backend.hadoop.executionengine.physicalLayer.PhysicalOperator#visit(org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor)
-     */
+ 
     @Override
     public void visit(PhyPlanVisitor v) throws VisitorException {
         v.visitStream(this);
         
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.pig.impl.plan.Operator#name()
-     */
     @Override
     public String name() {
        return toString(); 
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.pig.impl.plan.Operator#supportsMultipleInputs()
-     */
     @Override
     public boolean supportsMultipleInputs() {
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.pig.impl.plan.Operator#supportsMultipleOutputs()
-     */
     @Override
     public boolean supportsMultipleOutputs() {
         return false;

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java Thu May 13 17:28:06 2010
@@ -92,7 +92,8 @@ public class POUnion extends PhysicalOpe
 
     @Override
     public String name() {
-        return "Union" + "[" + DataType.findTypeName(resultType) + "]" +" - " + mKey.toString();
+        return getAliasString() + "Union" + "[" + DataType.findTypeName(resultType)
+                + "]" + " - " + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java Thu May 13 17:28:06 2010
@@ -142,7 +142,7 @@ public class LOCogroup extends Relationa
 
     @Override
     public String name() {
-        return "CoGroup " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "CoGroup " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCross.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCross.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCross.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCross.java Thu May 13 17:28:06 2010
@@ -175,7 +175,7 @@ public class LOCross extends RelationalO
 
     @Override
     public String name() {
-        return "Cross " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Cross " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LODistinct.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LODistinct.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LODistinct.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LODistinct.java Thu May 13 17:28:06 2010
@@ -99,7 +99,7 @@ public class LODistinct extends Relation
 
     @Override
     public String name() {
-        return "Distinct " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Distinct " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOFilter.java Thu May 13 17:28:06 2010
@@ -103,7 +103,7 @@ public class LOFilter extends Relational
 
     @Override
     public String name() {
-        return "Filter " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Filter " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOForEach.java Thu May 13 17:28:06 2010
@@ -117,7 +117,7 @@ public class LOForEach extends Relationa
 
     @Override
     public String name() {
-        return "ForEach " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "ForEach " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java Thu May 13 17:28:06 2010
@@ -125,7 +125,7 @@ public class LOJoin extends RelationalOp
 
     @Override
     public String name() {
-        return "LOJoin " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "LOJoin " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLimit.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLimit.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLimit.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLimit.java Thu May 13 17:28:06 2010
@@ -82,7 +82,7 @@ public class LOLimit extends RelationalO
 
     @Override
     public String name() {
-        return "Limit (" + mLimit + ") " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Limit (" + mLimit + ") " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOLoad.java Thu May 13 17:28:06 2010
@@ -133,7 +133,7 @@ public class LOLoad extends RelationalOp
 
     @Override
     public String name() {
-        return "Load " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Load " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSort.java Thu May 13 17:28:06 2010
@@ -130,7 +130,7 @@ public class LOSort extends RelationalOp
 
     @Override
     public String name() {
-        return "SORT " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "SORT " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplit.java Thu May 13 17:28:06 2010
@@ -71,7 +71,7 @@ public class LOSplit extends RelationalO
 
     @Override
     public String name() {
-        return "Split " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Split " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java Thu May 13 17:28:06 2010
@@ -75,7 +75,7 @@ public class LOSplitOutput extends Relat
     
     @Override
     public String name() {
-        return "SplitOutput[" + getAlias() + "] " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "SplitOutput[" + getAlias() + "] " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStore.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStore.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStore.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStore.java Thu May 13 17:28:06 2010
@@ -115,7 +115,7 @@ public class LOStore extends RelationalO
 
     @Override
     public String name() {
-        return "Store " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Store " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStream.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStream.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStream.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOStream.java Thu May 13 17:28:06 2010
@@ -159,7 +159,7 @@ public class LOStream extends Relational
      */
     @Override
     public String name() {
-        return "Stream (" + command.toString() + ") " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Stream (" + command.toString() + ") " + mKey.scope + "-" + mKey.id;
     }
 
     /* (non-Javadoc)

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOUnion.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOUnion.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOUnion.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOUnion.java Thu May 13 17:28:06 2010
@@ -110,7 +110,7 @@ public class LOUnion extends RelationalO
 
     @Override
     public String name() {
-        return "Union " + mKey.scope + "-" + mKey.id;
+        return getAliasString() + "Union " + mKey.scope + "-" + mKey.id;
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java Thu May 13 17:28:06 2010
@@ -213,6 +213,10 @@ abstract public class LogicalOperator ex
     public String getAlias() {
         return mAlias;
     }
+    
+    public String getAliasString() {
+        return (mAlias == null) ? "" : (mAlias + ": ");
+    }
 
     public void setAlias(String newAlias) {
         mAlias = newAlias;

Modified: hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCogroup.java Thu May 13 17:28:06 2010
@@ -56,21 +56,19 @@ public class POCogroup extends PhysicalO
     boolean[] inner;
 
     public POCogroup(OperatorKey k) {
-	super(k);
-	// TODO Auto-generated constructor stub
+        super(k);
     }
 
     public POCogroup(OperatorKey k, int rp) {
-	super(k, rp);
-	// TODO Auto-generated constructor stub
+        super(k, rp);
     }
 
     public POCogroup(OperatorKey k, List<PhysicalOperator> inp) {
-	super(k, inp);
+        super(k, inp);
     }
 
     public POCogroup(OperatorKey k, int rp, List<PhysicalOperator> inp) {
-	super(k, rp, inp);
+        super(k, rp, inp);
     }
     
     public void setInner(boolean[] inner) {
@@ -79,15 +77,14 @@ public class POCogroup extends PhysicalO
 
     @Override
     public void visit(PhyPlanVisitor v) throws VisitorException {
-	// TODO Auto-generated method stub
-	v.visitPenCogroup(this);
-
+        v.visitPenCogroup(this);
     }
 
     @Override
     public String name() {
-	// TODO Auto-generated method stub
-	return "POCogroup" + "[" + DataType.findTypeName(resultType) + "]" +" - " + mKey.toString();
+        return getAliasString() + "POCogroup"+ ": POCogroup" + "["
+                + DataType.findTypeName(resultType) + "]" + " - "
+                + mKey.toString();
     }
     
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POCross.java Thu May 13 17:28:06 2010
@@ -176,8 +176,7 @@ public class POCross extends PhysicalOpe
 
     @Override
     public String name() {
-        // TODO Auto-generated method stub
-        return "POCrossLocal" + " - " + mKey.toString();
+        return getAliasString() + "POCrossLocal" + " - " + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplitOutput.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplitOutput.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplitOutput.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/pen/physicalOperators/POSplitOutput.java Thu May 13 17:28:06 2010
@@ -108,8 +108,7 @@ public class POSplitOutput extends Physi
 
     @Override
     public String name() {
-	// TODO Auto-generated method stub
-	return "POSplitOutput " + mKey.toString();
+        return getAliasString() + "POSplitOutput " + mKey.toString();
     }
 
     @Override

Modified: hadoop/pig/trunk/test/org/apache/pig/test/TestLogToPhyCompiler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/TestLogToPhyCompiler.java?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/TestLogToPhyCompiler.java (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/TestLogToPhyCompiler.java Thu May 13 17:28:06 2010
@@ -84,24 +84,6 @@ public class TestLogToPhyCompiler extend
     protected void setUp() throws Exception {
         pc.connect();
     }
-
-    private void writeData(File input, int noTuples, int arityOfTuples, char separator) throws IOException {
-    	FileOutputStream dat = new FileOutputStream(input);
-        
-        for(int i = 0; i < noTuples; i++) {
-            
-            for(int j = 0; j < arityOfTuples; j++) {
-            	int temp = r.nextInt(MAX_RANGE);
-            	if(j == arityOfTuples - 1) {
-            		dat.write((temp + "\n").getBytes());
-            	} else {
-            		dat.write((temp + "" + separator).getBytes());
-            	}
-            }
-        }
-                    
-        dat.close();
-    }
     
     @Test
     public void testComplexForeach() throws VisitorException, IOException {

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld Thu May 13 17:28:06 2010
@@ -22,4 +22,4 @@ New For Each(false,false,false)[bag] - T
 |   |
 |   Constant(hello) - Test-Plan-Builder-102
 |
-|---Load(A:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-91
+|---66: Load(file:///homes/rding/apache-pig/trunk/A:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-91

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld Thu May 13 17:28:06 2010
@@ -20,4 +20,4 @@ New For Each(false)[bag] - Test-Plan-Bui
 |       |
 |       |---Project[bytearray][3] - Test-Plan-Builder-161
 |
-|---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-153
+|---130: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-153

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld Thu May 13 17:28:06 2010
@@ -16,7 +16,7 @@ Package[tuple]{tuple} - Test-Plan-Builde
     |   |   |
     |   |   |---Project[bytearray][1] - Test-Plan-Builder-57
     |   |
-    |   |---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-48
+    |   |---33: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-48
     |
     |---Local Rearrange[tuple]{tuple}(false) - Test-Plan-Builder-59
         |   |
@@ -32,4 +32,4 @@ Package[tuple]{tuple} - Test-Plan-Builde
         |   |
         |   |---Project[bytearray][1] - Test-Plan-Builder-64
         |
-        |---Load(b:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-49
+        |---40: Load(file:///homes/rding/apache-pig/trunk/b:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-49

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld Thu May 13 17:28:06 2010
@@ -22,4 +22,4 @@ Filter[bag] - Test-Plan-Builder-118
 |           |
 |           |---Constant(2) - Test-Plan-Builder-126
 |
-|---Load(a:org.apache.pig.builtin.PigStorage(':')) - Test-Plan-Builder-117
+|---104: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage(':')) - Test-Plan-Builder-117

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld Thu May 13 17:28:06 2010
@@ -2,7 +2,7 @@ New For Each(false)[bag] - Test-Plan-Bui
 |   |
 |   RelationToExpressionProject[bag][*] - Test-Plan-Builder-21
 |   |
-|   |---Filter[bag] - Test-Plan-Builder-17
+|   |---B: Filter[bag] - Test-Plan-Builder-17
 |       |   |
 |       |   Equal To[boolean] - Test-Plan-Builder-20
 |       |   |
@@ -12,4 +12,4 @@ New For Each(false)[bag] - Test-Plan-Bui
 |       |
 |       |---Project[tuple][0] - Test-Plan-Builder-16
 |
-|---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-15
+|---0: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-15

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld Thu May 13 17:28:06 2010
@@ -1,3 +1,3 @@
 PODistinct[bag] - Test-Plan-Builder-32
 |
-|---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-31
+|---29: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-31

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld Thu May 13 17:28:06 2010
@@ -34,4 +34,4 @@ New For Each(false,false,false,false,fal
 |   |
 |   |---Project[bytearray][1] - Test-Plan-Builder-218
 |
-|---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-202
+|---165: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-202

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld Thu May 13 17:28:06 2010
@@ -1,4 +1,4 @@
-Filter[tuple] - Test-Plan-Builder-258
+x: Filter[tuple] - Test-Plan-Builder-258
 |   |
 |   POIsNull[tuple] - Test-Plan-Builder-260
 |   |
@@ -6,9 +6,9 @@ Filter[tuple] - Test-Plan-Builder-258
 |
 |---Split - Test-Plan-Builder-257
     |
-    |---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-256
+    |---248: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-256
 
-Filter[tuple] - Test-Plan-Builder-261
+y: Filter[tuple] - Test-Plan-Builder-261
 |   |
 |   Not[boolean] - Test-Plan-Builder-264
 |   |
@@ -18,4 +18,4 @@ Filter[tuple] - Test-Plan-Builder-261
 |
 |---Split - Test-Plan-Builder-257
     |
-    |---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-256
+    |---248: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-256

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld Thu May 13 17:28:06 2010
@@ -1,3 +1,3 @@
 Limit - Test-Plan-Builder-268
 |
-|---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-267
+|---265: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-267

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld Thu May 13 17:28:06 2010
@@ -88,4 +88,4 @@ MapReduce(1,GFCross) - -156:
                 |       |   |
                 |       |   Constant(true) - --6860857982727545176
                 |       |
-                |       |---Load(DummyFil:DummyLdr) - -737965411848544085
+                |       |---Load(DummyFil:DummyLdr) - -737965411848544085
\ No newline at end of file

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld Thu May 13 17:28:06 2010
@@ -1,10 +1,10 @@
 MapReduce(-1,PigStorage) - scope-125:
 Reduce Plan Empty
-|   Store(/tmp:org.apache.pig.builtin.PigStorage) - scope-124
+|   c: Store(/tmp:org.apache.pig.builtin.PigStorage) - scope-124
 |   |
-|   |---MergeJoin[tuple] - scope-121
+|   |---c: MergeJoin[tuple] - scope-121
 |       |
-|       |---Load(/tmp/input1:org.apache.pig.builtin.PigStorage) - scope-117
+|       |---a: Load(/tmp/input1:org.apache.pig.builtin.PigStorage) - scope-117
 |
 |---MapReduce(1,PigStorage) - scope-126:
     |   Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - scope-132
@@ -18,4 +18,4 @@ Reduce Plan Empty
     |   |   |
     |   |   Project[tuple][*] - scope-127
     |   |
-    |   |---Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihaaaaaaaabhhaeaaaaaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaaaaaaaaaaaaaabacaaabfkaaangfgogeepggebgmgmejgohahfhehihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgogpkikkjgaddcgofpacaaagemaaakgneghcgpgnefgeghgfhdheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlemaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaignfegpefgeghgfhdhbaahoaaaehihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhaaaaaaaaaaaaaaaacacaaabemaaaegnengbh
 ahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaaaaaaaaaaaaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaaaaaaaaaaaaaahiheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaaaaaaaaaaaaaabacaaaffkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghfkaaaehdhegbhcemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhedlhihcaagcgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagf
 hcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaadgmgpghheaacaemgphcghcpgbhagbgdgigfcpgdgpgngngpgohdcpgmgpghghgjgoghcpemgpghdlhihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaaaaaaaaaaaaaabacaaamfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaadgmgpghhbaahoaabeemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfagmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigfcph
 agjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapaaaappppppppdchahahahahdhcaaclgphcghcogbhagbgdgigfcogdgpgngngpgohdcogmgpghghgjgoghcogjgnhagmcoemgpghdeekemgpghghgfhccikmpnoicknfncdiacaaabemaaaegogbgngfhbaahoaaaohihaheaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdhehahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaaaaaaaaaaaaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdhfgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachahbaahoaaboaaaaaaaahdhbaahoaaaaaaaaaaabhhaeaaaaaaabhdhcaabb
 gkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailacaaaahihaaaaaaaaahihihdhbaahoaaaaaaaaaaabhhaeaaaaaaakhbaahoaabmhihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhbaahoaabmhbaahoaaaphihdhbaahoaaaaaaaaaaaahhaeaaaaaaakhihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahiaahi','','b','scope','true')) - scope-118
\ No newline at end of file
+    |   |---b: Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihaaaaaaaabhhaeaaaaaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaaaaaaaaaaaaaabacaaabfkaaangfgogeepggebgmgmejgohahfhehihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgogpkikkjgaddcgofpacaaagemaaakgneghcgpgnefgeghgfhdheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlemaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaignfegpefgeghgfhdhbaahoaaaehihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhaaaaaaaaaaaaaaaacacaaabemaaaegnen
 gbhahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaaaaaaaaaaaaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaaaaaaaaaaaaaahiheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaaaaaaaaaaaaaabacaaaffkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghfkaaaehdhegbhcemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhedlhihcaagcgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoeph
 agfhcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaadgmgpghheaacaemgphcghcpgbhagbgdgigfcpgdgpgngngpgohdcpgmgpghghgjgoghcpemgpghdlhihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaaaaaaaaaaaaaabacaaamfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaadgmgpghhbaahoaabeemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfagmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigf
 cphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapaaaappppppppdchahahahahdhcaaclgphcghcogbhagbgdgigfcogdgpgngngpgohdcogmgpghghgjgoghcogjgnhagmcoemgpghdeekemgpghghgfhccikmpnoicknfncdiacaaabemaaaegogbgngfhbaahoaaaohihaheaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdhehahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaaaaaaaaaaaaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdhfgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachahbaahoaaboaaaaaaaahdhbaahoaaaaaaaaaaabhhaeaaaaaaabhdhca
 abbgkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailacaaaahihaaaaaaaaahihihdhbaahoaaaaaaaaaaabhhaeaaaaaaakhbaahoaabmhihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhbaahoaabmhbaahoaaaphihdhbaahoaaaaaaaaaaaahhaeaaaaaaakhihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahiaahi','','b','scope','true')) - scope-118
\ No newline at end of file

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld Thu May 13 17:28:06 2010
@@ -2,4 +2,4 @@ POSort[bag]() - Test-Plan-Builder-28
 |   |
 |   Project[bytearray][0] - Test-Plan-Builder-27
 |
-|---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-26
+|---23: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-26

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld Thu May 13 17:28:06 2010
@@ -1,4 +1,4 @@
-Filter[tuple] - Test-Plan-Builder-240
+y: Filter[tuple] - Test-Plan-Builder-240
 |   |
 |   Greater Than[boolean] - Test-Plan-Builder-243
 |   |
@@ -8,9 +8,9 @@ Filter[tuple] - Test-Plan-Builder-240
 |
 |---Split - Test-Plan-Builder-239
     |
-    |---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-238
+    |---229: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-238
 
-Filter[tuple] - Test-Plan-Builder-244
+x: Filter[tuple] - Test-Plan-Builder-244
 |   |
 |   Less Than[boolean] - Test-Plan-Builder-247
 |   |
@@ -20,4 +20,4 @@ Filter[tuple] - Test-Plan-Builder-244
 |
 |---Split - Test-Plan-Builder-239
     |
-    |---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-238
+    |---229: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-238

Modified: hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld?rev=943945&r1=943944&r2=943945&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld Thu May 13 17:28:06 2010
@@ -1,7 +1,7 @@
 Union[bag] - Test-Plan-Builder-228
 |
-|---Load(a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-225
+|---221: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-225
 |
-|---Load(b:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-226
+|---222: Load(file:///homes/rding/apache-pig/trunk/b:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-226
 |
-|---Load(c:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-227
+|---223: Load(file:///homes/rding/apache-pig/trunk/c:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-227



Mime
View raw message