You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by xu...@apache.org on 2011/05/03 18:53:42 UTC
svn commit: r1099121 [8/8] - in /pig/trunk: ./ src/org/apache/pig/
src/org/apache/pig/backend/hadoop/executionengine/
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/
src/org/apache/pig/impl/ src/org/apache/pig/impl/logicalLayer/ src/o...
Modified: pig/trunk/test/org/apache/pig/test/Util.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/Util.java?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/Util.java (original)
+++ pig/trunk/test/org/apache/pig/test/Util.java Tue May 3 16:53:40 2011
@@ -65,7 +65,6 @@ import org.apache.pig.backend.hadoop.dat
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MRCompiler;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MapReduceLauncher;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.plans.MROperPlan;
-import org.apache.pig.backend.hadoop.executionengine.physicalLayer.LogToPhyTranslationVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.backend.hadoop.executionengine.util.MapRedUtil;
import org.apache.pig.data.BagFactory;
@@ -77,15 +76,15 @@ import org.apache.pig.data.TupleFactory;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.logicalLayer.LogicalPlan;
import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.logicalLayer.parser.QueryParser;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.CompilationMessageCollector;
import org.apache.pig.impl.util.LogUtils;
-import org.apache.pig.newplan.logical.LogicalPlanMigrationVistor;
import org.apache.pig.newplan.logical.optimizer.LogicalPlanPrinter;
import org.apache.pig.newplan.logical.optimizer.SchemaResetter;
+import org.apache.pig.newplan.logical.relational.LogToPhyTranslationVisitor;
+import org.apache.pig.newplan.logical.relational.LogicalPlan;
import org.apache.pig.newplan.logical.optimizer.UidResetter;
import org.apache.pig.newplan.logical.rules.LoadStoreFuncDupSignatureValidator;
import org.apache.pig.newplan.logical.visitor.CastLineageSetter;
@@ -649,38 +648,14 @@ public class Util {
return f;
}
- public static PhysicalPlan buildPhysicalPlan(LogicalPlan lp, PigContext pc) throws Exception {
- LogToPhyTranslationVisitor visitor = new LogToPhyTranslationVisitor(lp);
- visitor.setPigContext(pc);
- visitor.visit();
- return visitor.getPhysicalPlan();
- }
-
- /**
- * migrate old logical plan to new logical plan
- * @param lp
- * @return new logical plan
- * @throws FrontendException
- */
- public static org.apache.pig.newplan.logical.relational.LogicalPlan migrateToNewLP(LogicalPlan lp)
- throws FrontendException{
- LogicalPlanMigrationVistor visitor = new LogicalPlanMigrationVistor(lp);
- visitor.visit();
- org.apache.pig.newplan.logical.relational.LogicalPlan newPlan = visitor.getNewLogicalPlan();
-
- SchemaResetter schemaResetter = new SchemaResetter(newPlan);
- schemaResetter.visit();
- return newPlan;
- }
-
/**
* Run default set of optimizer rules on new logical plan
* @param lp
* @return optimized logical plan
* @throws FrontendException
*/
- public static org.apache.pig.newplan.logical.relational.LogicalPlan optimizeNewLP(
- org.apache.pig.newplan.logical.relational.LogicalPlan lp)
+ public static LogicalPlan optimizeNewLP(
+ LogicalPlan lp)
throws FrontendException{
UidResetter uidResetter = new UidResetter( lp );
uidResetter.visit();
@@ -714,20 +689,14 @@ public class Util {
* @throws Exception
*/
public static PhysicalPlan buildPhysicalPlanFromNewLP(
- org.apache.pig.newplan.logical.relational.LogicalPlan lp, PigContext pc)
+ LogicalPlan lp, PigContext pc)
throws Exception {
- org.apache.pig.newplan.logical.relational.LogToPhyTranslationVisitor visitor =
- new org.apache.pig.newplan.logical.relational.LogToPhyTranslationVisitor(lp);
+ LogToPhyTranslationVisitor visitor = new LogToPhyTranslationVisitor(lp);
visitor.setPigContext(pc);
visitor.visit();
return visitor.getPhysicalPlan();
}
- public static PhysicalPlan getNewOptimizedPhysicalPlan(LogicalPlan lp, PigContext pc)
- throws FrontendException, Exception{
- return buildPhysicalPlanFromNewLP(optimizeNewLP(migrateToNewLP(lp)), pc);
- }
-
public static MROperPlan buildMRPlan(PhysicalPlan pp, PigContext pc) throws Exception{
MRCompiler comp = new MRCompiler(pp, pc);
comp.compile();
@@ -835,7 +804,7 @@ public class Util {
return readOutput(FileSystem.get(conf), fileName);
}
- public static void printPlan(org.apache.pig.newplan.logical.relational.LogicalPlan logicalPlan ) throws Exception {
+ public static void printPlan(LogicalPlan logicalPlan ) throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(out);
LogicalPlanPrinter pp = new LogicalPlanPrinter(logicalPlan,ps);
@@ -843,13 +812,6 @@ public class Util {
System.err.println(out.toString());
}
- public static void printPlan(LogicalPlan logicalPlan) throws Exception {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(out);
- logicalPlan.explain(ps, "text", true);
- System.err.println(out.toString());
- }
-
public static void printPlan(PhysicalPlan physicalPlan) throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(out);
@@ -930,7 +892,26 @@ public class Util {
}
}
- public static org.apache.pig.newplan.logical.relational.LogicalPlan parse(String query, PigContext pc) throws FrontendException {
+ public static LogicalPlan buildLp(PigServer pigServer, String query)
+ throws Exception {
+ pigServer.setBatchOn();
+ pigServer.registerQuery( query );
+ java.lang.reflect.Method buildLp = pigServer.getClass().getDeclaredMethod("buildLp");
+ buildLp.setAccessible(true);
+ return (LogicalPlan ) buildLp.invoke( pigServer );
+ }
+
+ public static PhysicalPlan buildPp(PigServer pigServer, String query)
+ throws Exception {
+ buildLp( pigServer, query );
+ java.lang.reflect.Method compilePp = pigServer.getClass().getDeclaredMethod("compilePp" );
+ compilePp.setAccessible(true);
+
+ return (PhysicalPlan)compilePp.invoke( pigServer );
+
+ }
+
+ public static LogicalPlan parse(String query, PigContext pc) throws FrontendException {
Map<String, String> fileNameMap = new HashMap<String, String>();
QueryParserDriver parserDriver = new QueryParserDriver( pc, "test", fileNameMap );
org.apache.pig.newplan.logical.relational.LogicalPlan lp = parserDriver.parse( query );
@@ -948,7 +929,7 @@ public class Util {
return lp;
}
- public static org.apache.pig.newplan.logical.relational.LogicalPlan parseAndPreprocess(String query, PigContext pc) throws FrontendException {
+ public static LogicalPlan parseAndPreprocess(String query, PigContext pc) throws FrontendException {
Map<String, String> fileNameMap = new HashMap<String, String>();
QueryParserDriver parserDriver = new QueryParserDriver( pc, "test", fileNameMap );
org.apache.pig.newplan.logical.relational.LogicalPlan lp = parserDriver.parse( query );
@@ -965,4 +946,5 @@ public class Util {
new CastLineageSetter(lp, collector).visit();
return lp;
}
+
}
Modified: pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot (original)
+++ pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot Tue May 3 16:53:40 2011
@@ -4,4 +4,5 @@ digraph graph1 {
LOLimit -> LOForEach;
LOForEach [hasflat="false"];
LOForEach -> LOCogroup;
+ LOCogroup -> LOStore;
}
Modified: pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot (original)
+++ pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot Tue May 3 16:53:40 2011
@@ -7,4 +7,5 @@ digraph graph1 {
LOLimit -> LOCross;
LOCross -> LOLimit;
LOLimit [limit="100"];
+ LOLimit -> LOStore;
}
Modified: pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot (original)
+++ pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot Tue May 3 16:53:40 2011
@@ -4,4 +4,5 @@ digraph graph1 {
LOForEach [hasflat="true"];
LOForEach -> LOLimit;
LOLimit [limit="100"];
+ LOLimit -> LOStore;
}
Modified: pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot (original)
+++ pig/trunk/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot Tue May 3 16:53:40 2011
@@ -3,4 +3,5 @@ digraph graph1 {
LOForEach [hasflat="true"];
LOForEach -> LOLimit;
LOLimit [limit="100"];
+ LOLimit -> LOStore;
}
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld Tue May 3 16:53:40 2011
@@ -1,25 +1,37 @@
-New For Each(false,false,false)[bag] - Test-Plan-Builder-103
-| |
-| Add[chararray] - Test-Plan-Builder-96
-| |
-| |---Add[bytearray] - Test-Plan-Builder-94
-| | |
-| | |---Project[bytearray][0] - Test-Plan-Builder-92
-| | |
-| | |---Project[bytearray][1] - Test-Plan-Builder-93
-| |
-| |---Constant(5) - Test-Plan-Builder-95
-| |
-| Subtract[chararray] - Test-Plan-Builder-101
-| |
-| |---Subtract[chararray] - Test-Plan-Builder-99
-| | |
-| | |---Project[bytearray][0] - Test-Plan-Builder-97
-| | |
-| | |---Constant(5) - Test-Plan-Builder-98
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-100
-| |
-| Constant(hello) - Test-Plan-Builder-102
+test-12: Store()
|
-|---66: Load(file:///homes/rding/apache-pig/trunk/A:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-91
+|---A: New For Each(false,false,false)[bag] - scope-64
+ | |
+ | Add[double] - scope-51
+ | |
+ | |---Add[double] - scope-48
+ | | |
+ | | |---Cast[double] - scope-45
+ | | | |
+ | | | |---Project[bytearray][0] - scope-44
+ | | |
+ | | |---Cast[double] - scope-47
+ | | |
+ | | |---Project[bytearray][1] - scope-46
+ | |
+ | |---Cast[double] - scope-50
+ | |
+ | |---Constant(5) - scope-49
+ | |
+ | Subtract[int] - scope-60
+ | |
+ | |---Subtract[int] - scope-57
+ | | |
+ | | |---Cast[int] - scope-55
+ | | | |
+ | | | |---Project[bytearray][0] - scope-54
+ | | |
+ | | |---Constant(5) - scope-56
+ | |
+ | |---Cast[int] - scope-59
+ | |
+ | |---Project[bytearray][1] - scope-58
+ | |
+ | Constant(hello) - scope-63
+ |
+ |---test-11: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld Tue May 3 16:53:40 2011
@@ -1,23 +1,35 @@
-New For Each(false)[bag] - Test-Plan-Builder-164
-| |
-| POBinCond[bytearray] - Test-Plan-Builder-163
-| |
-| |---Equal To[boolean] - Test-Plan-Builder-156
-| | |
-| | |---Project[bytearray][1] - Test-Plan-Builder-154
-| | |
-| | |---Constant(3) - Test-Plan-Builder-155
-| |
-| |---Add[bytearray] - Test-Plan-Builder-159
-| | |
-| | |---Project[bytearray][2] - Test-Plan-Builder-157
-| | |
-| | |---Project[bytearray][3] - Test-Plan-Builder-158
-| |
-| |---Subtract[bytearray] - Test-Plan-Builder-162
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-160
-| |
-| |---Project[bytearray][3] - Test-Plan-Builder-161
+test-16: Store()
|
-|---130: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-153
+|---A: New For Each(false)[bag] - scope-106
+ | |
+ | POBinCond[double] - scope-100
+ | |
+ | |---Equal To[boolean] - scope-89
+ | | |
+ | | |---Cast[chararray] - scope-87
+ | | | |
+ | | | |---Project[bytearray][1] - scope-86
+ | | |
+ | | |---Constant(3) - scope-88
+ | |
+ | |---Add[double] - scope-94
+ | | |
+ | | |---Cast[double] - scope-91
+ | | | |
+ | | | |---Project[bytearray][2] - scope-90
+ | | |
+ | | |---Cast[double] - scope-93
+ | | |
+ | | |---Project[bytearray][3] - scope-92
+ | |
+ | |---Subtract[double] - scope-99
+ | |
+ | |---Cast[double] - scope-96
+ | | |
+ | | |---Project[bytearray][2] - scope-95
+ | |
+ | |---Cast[double] - scope-98
+ | |
+ | |---Project[bytearray][3] - scope-97
+ |
+ |---test-15: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld Tue May 3 16:53:40 2011
@@ -1,35 +1,53 @@
-Package[tuple]{tuple} - Test-Plan-Builder-51
+test-10: Store()
|
-|---Global Rearrange[tuple] - Test-Plan-Builder-50
+|---A: Package[tuple]{tuple} - scope-19
|
- |---Local Rearrange[tuple]{tuple}(false) - Test-Plan-Builder-52
- | | |
- | | Add[bytearray] - Test-Plan-Builder-55
- | | |
- | | |---Project[bytearray][0] - Test-Plan-Builder-53
- | | |
- | | |---Project[bytearray][1] - Test-Plan-Builder-54
- | | |
- | | Subtract[bytearray] - Test-Plan-Builder-58
- | | |
- | | |---Project[bytearray][0] - Test-Plan-Builder-56
- | | |
- | | |---Project[bytearray][1] - Test-Plan-Builder-57
- | |
- | |---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
- | |
- | Add[bytearray] - Test-Plan-Builder-62
- | |
- | |---Project[bytearray][0] - Test-Plan-Builder-60
- | |
- | |---Project[bytearray][1] - Test-Plan-Builder-61
- | |
- | Subtract[bytearray] - Test-Plan-Builder-65
- | |
- | |---Project[bytearray][0] - Test-Plan-Builder-63
+ |---A: Global Rearrange[tuple] - scope-18
+ |
+ |---A: Local Rearrange[tuple]{tuple}(false) - scope-20
+ | | |
+ | | Add[double] - scope-25
+ | | |
+ | | |---Cast[double] - scope-22
+ | | | |
+ | | | |---Project[bytearray][0] - scope-21
+ | | |
+ | | |---Cast[double] - scope-24
+ | | |
+ | | |---Project[bytearray][1] - scope-23
+ | | |
+ | | Subtract[double] - scope-30
+ | | |
+ | | |---Cast[double] - scope-27
+ | | | |
+ | | | |---Project[bytearray][0] - scope-26
+ | | |
+ | | |---Cast[double] - scope-29
+ | | |
+ | | |---Project[bytearray][1] - scope-28
| |
- | |---Project[bytearray][1] - Test-Plan-Builder-64
+ | |---test-8: Load()
|
- |---40: Load(file:///homes/rding/apache-pig/trunk/b:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-49
+ |---A: Local Rearrange[tuple]{tuple}(false) - scope-31
+ | |
+ | Add[double] - scope-36
+ | |
+ | |---Cast[double] - scope-33
+ | | |
+ | | |---Project[bytearray][0] - scope-32
+ | |
+ | |---Cast[double] - scope-35
+ | |
+ | |---Project[bytearray][1] - scope-34
+ | |
+ | Subtract[double] - scope-41
+ | |
+ | |---Cast[double] - scope-38
+ | | |
+ | | |---Project[bytearray][0] - scope-37
+ | |
+ | |---Cast[double] - scope-40
+ | |
+ | |---Project[bytearray][1] - scope-39
+ |
+ |---test-9: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld Tue May 3 16:53:40 2011
@@ -1,25 +1,37 @@
-Filter[bag] - Test-Plan-Builder-118
-| |
-| Greater Than[boolean] - Test-Plan-Builder-129
-| |
-| |---Add[bytearray] - Test-Plan-Builder-121
-| | |
-| | |---Project[bytearray][0] - Test-Plan-Builder-119
-| | |
-| | |---Project[bytearray][1] - Test-Plan-Builder-120
-| |
-| |---Multiply[chararray] - Test-Plan-Builder-128
-| |
-| |---Subtract[bytearray] - Test-Plan-Builder-124
-| | |
-| | |---Project[bytearray][0] - Test-Plan-Builder-122
-| | |
-| | |---Project[bytearray][1] - Test-Plan-Builder-123
-| |
-| |---Divide[chararray] - Test-Plan-Builder-127
-| |
-| |---Constant(4) - Test-Plan-Builder-125
-| |
-| |---Constant(2) - Test-Plan-Builder-126
+test-14: Store()
|
-|---104: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage(':')) - Test-Plan-Builder-117
+|---A: Filter[bag] - scope-67
+ | |
+ | Greater Than[boolean] - scope-83
+ | |
+ | |---Add[double] - scope-72
+ | | |
+ | | |---Cast[double] - scope-69
+ | | | |
+ | | | |---Project[bytearray][0] - scope-68
+ | | |
+ | | |---Cast[double] - scope-71
+ | | |
+ | | |---Project[bytearray][1] - scope-70
+ | |
+ | |---Multiply[double] - scope-82
+ | |
+ | |---Subtract[double] - scope-77
+ | | |
+ | | |---Cast[double] - scope-74
+ | | | |
+ | | | |---Project[bytearray][0] - scope-73
+ | | |
+ | | |---Cast[double] - scope-76
+ | | |
+ | | |---Project[bytearray][1] - scope-75
+ | |
+ | |---Cast[double] - scope-81
+ | |
+ | |---Divide[int] - scope-80
+ | |
+ | |---Constant(4) - scope-78
+ | |
+ | |---Constant(2) - scope-79
+ |
+ |---test-13: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld Tue May 3 16:53:40 2011
@@ -1,15 +1,17 @@
-New For Each(false)[bag] - Test-Plan-Builder-22
-| |
-| RelationToExpressionProject[bag][*] - Test-Plan-Builder-21
-| |
-| |---B: Filter[bag] - Test-Plan-Builder-17
-| | |
-| | Equal To[boolean] - Test-Plan-Builder-20
-| | |
-| | |---Project[Unknown][1] - Test-Plan-Builder-18
-| | |
-| | |---Project[Unknown][2] - Test-Plan-Builder-19
-| |
-| |---Project[tuple][0] - Test-Plan-Builder-16
+test-1: Store()
|
-|---0: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-15
+|---C: New For Each(false)[bag] - scope-7
+ | |
+ | RelationToExpressionProject[bag][*] - scope-1
+ | |
+ | |---B: Filter[bag] - scope-3
+ | | |
+ | | Equal To[boolean] - scope-6
+ | | |
+ | | |---Project[bytearray][1] - scope-4
+ | | |
+ | | |---Project[bytearray][2] - scope-5
+ | |
+ | |---Project[bag][0] - scope-2
+ |
+ |---test-0: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld Tue May 3 16:53:40 2011
@@ -1,3 +1,5 @@
-PODistinct[bag] - Test-Plan-Builder-32
+test-7: Store()
|
-|---29: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-31
+|---test-6: PODistinct[bag] - scope-14
+ |
+ |---test-5: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Generate.gld Tue May 3 16:53:40 2011
@@ -1,37 +1,61 @@
-New For Each(false,false,false,false,false,false)[bag] - Test-Plan-Builder-220
-| |
-| Add[bytearray] - Test-Plan-Builder-205
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-203
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-204
-| |
-| Subtract[bytearray] - Test-Plan-Builder-208
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-206
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-207
-| |
-| Multiply[bytearray] - Test-Plan-Builder-211
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-209
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-210
-| |
-| Divide[bytearray] - Test-Plan-Builder-214
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-212
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-213
-| |
-| Mod[bytearray] - Test-Plan-Builder-217
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-215
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-216
-| |
-| PONegative[bytearray] - Test-Plan-Builder-219
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-218
+test-18: Store()
|
-|---165: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-202
+|---A: New For Each(false,false,false,false,false,false)[bag] - scope-148
+ | |
+ | Add[double] - scope-113
+ | |
+ | |---Cast[double] - scope-110
+ | | |
+ | | |---Project[bytearray][1] - scope-109
+ | |
+ | |---Cast[double] - scope-112
+ | |
+ | |---Project[bytearray][2] - scope-111
+ | |
+ | Subtract[double] - scope-120
+ | |
+ | |---Cast[double] - scope-117
+ | | |
+ | | |---Project[bytearray][1] - scope-116
+ | |
+ | |---Cast[double] - scope-119
+ | |
+ | |---Project[bytearray][2] - scope-118
+ | |
+ | Multiply[double] - scope-127
+ | |
+ | |---Cast[double] - scope-124
+ | | |
+ | | |---Project[bytearray][1] - scope-123
+ | |
+ | |---Cast[double] - scope-126
+ | |
+ | |---Project[bytearray][2] - scope-125
+ | |
+ | Divide[double] - scope-134
+ | |
+ | |---Cast[double] - scope-131
+ | | |
+ | | |---Project[bytearray][1] - scope-130
+ | |
+ | |---Cast[double] - scope-133
+ | |
+ | |---Project[bytearray][2] - scope-132
+ | |
+ | Mod[int] - scope-141
+ | |
+ | |---Cast[int] - scope-138
+ | | |
+ | | |---Project[bytearray][1] - scope-137
+ | |
+ | |---Cast[int] - scope-140
+ | |
+ | |---Project[bytearray][2] - scope-139
+ | |
+ | PONegative[double] - scope-146
+ | |
+ | |---Cast[double] - scope-145
+ | |
+ | |---Project[bytearray][1] - scope-144
+ |
+ |---test-17: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld Tue May 3 16:53:40 2011
@@ -1,21 +1,23 @@
-x: Filter[tuple] - Test-Plan-Builder-258
+y: Filter[bag] - scope-170
| |
-| POIsNull[tuple] - Test-Plan-Builder-260
+| Not[boolean] - scope-173
| |
-| |---Project[bytearray][0] - Test-Plan-Builder-259
+| |---POIsNull[boolean] - scope-172
+| |
+| |---Project[bytearray][0] - scope-171
|
-|---Split - Test-Plan-Builder-257
+|---test-27: Split - scope-169
|
- |---248: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-256
+ |---test-26: Load()
-y: Filter[tuple] - Test-Plan-Builder-261
-| |
-| Not[boolean] - Test-Plan-Builder-264
-| |
-| |---POIsNull[tuple] - Test-Plan-Builder-263
-| |
-| |---Project[bytearray][0] - Test-Plan-Builder-262
+test-28: Store()
|
-|---Split - Test-Plan-Builder-257
+|---x: Filter[bag] - scope-174
+ | |
+ | POIsNull[boolean] - scope-176
+ | |
+ | |---Project[bytearray][0] - scope-175
|
- |---248: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-256
+ |---test-27: Split - scope-169
+ |
+ |---test-26: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Limit.gld Tue May 3 16:53:40 2011
@@ -1,3 +1,5 @@
-Limit - Test-Plan-Builder-268
+test-31: Store()
|
-|---265: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-267
+|---test-30: Limit - scope-179
+ |
+ |---test-29: Load()
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=1099121&r1=1099120&r2=1099121&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 Tue May 3 16:53:40 2011
@@ -1,21 +1,21 @@
-MapReduce(-1,PigStorage) - scope-124:
+MapReduce(-1,PigStorage) - scope-109:
Reduce Plan Empty
-| c: Store(/tmp:org.apache.pig.builtin.PigStorage) - scope-123
+| c: Store(/tmp/output1:org.apache.pig.builtin.PigStorage) - scope-108
| |
-| |---c: MergeJoin[tuple] - scope-120
+| |---c: MergeJoin[tuple] - scope-105
| |
-| |---a: Load(/tmp/input1:org.apache.pig.builtin.PigStorage) - scope-116
+| |---a: Load(/tmp/input1:org.apache.pig.builtin.PigStorage) - scope-101
|
-|---MapReduce(1,PigStorage) - scope-125:
- | Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - scope-131
+|---MapReduce(1,PigStorage) - scope-110:
+ | Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - scope-116
| |
- | |---New For Each(true)[bag] - scope-130
+ | |---New For Each(true)[bag] - scope-115
| | |
- | | Project[tuple][1] - scope-129
+ | | Project[tuple][1] - scope-114
| |
- | |---Package[tuple]{tuple} - scope-128
- | Local Rearrange[tuple]{tuple}(false) - scope-127
+ | |---Package[tuple]{tuple} - scope-113
+ | Local Rearrange[tuple]{tuple}(false) - scope-112
| | |
- | | Project[tuple][*] - scope-126
+ | | Project[tuple][*] - scope-111
| |
- | |---b: Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihaaaaaaaabhhaeaaaaaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaaaaaaaaaaaaaabacaaacfkaaangfgogeepggebgmgmejgohahfheemaaafgphagngbhaheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlhihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgoeaondlnechegpmlgacaaaiemaaakgneghcgpgnefgeghgfhdhbaahoaaademaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaognfdgpggheeghcgpgnefgeghgfhdhbaahoaaademaaamgnfdgpgghefegpefgeghgfhdhbaahoaaademaaaignfegpefgeghgfhdhbaahoaaad
hihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhaaaaaaaaaaaaaaaacacaaabemaaaegnengbhahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaaaaaaaaaaaaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaaaaaaaaaaaaaahhheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaaaaaaaaaaaaaabacaaagfkaaaogjhdfahcgpgkgfgdhefegpefgogefkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghejaaaihdhegbhcheedgpgmemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhed
lhihcaagcgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaaahihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaaaaaaaaaaaaaabacaaalfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfa
gmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapaaaappppppppdchahahahahahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaaaaaaaaaaaaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdhfgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachaaaaaaaaaaaaaaaaahdhbaahoaaaaaaaaaaabhhaeaaaaaaabhdhcaabbgkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailacaaaahihaaaaaaaaahihihdhbaahoaaaaaaaaaaabhhaeaaaaaaakhbaahoaablhihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhbaahoaablhbaahoaaaphihdhbaahoaaaaaaa
aaaaahhaeaaaaaaakhihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahiaahahi','','b','scope','true')) - scope-117
\ No newline at end of file
+ | |---b: Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihaaaaaaaabhhaeaaaaaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaaaaaaaaaaaaaabacaaacfkaaangfgogeepggebgmgmejgohahfheemaaafgphagngbhaheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlhihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgoeaondlnechegpmlgacaaaiemaaakgneghcgpgnefgeghgfhdhbaahoaaademaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaognfdgpggheeghcgpgnefgeghgfhdhbaahoaaademaaamgnfdgpgghefegpefgeghgfhdhbaahoaaademaaaignfegpefgeghgfhdhbaahoaaad
hihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhaaaaaaaaaaaaaaaacacaaabemaaaegnengbhahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaaaaaaaaaaaaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaaaaaaaaaaaaaagiheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaaaaaaaaaaaaaabacaaagfkaaaogjhdfahcgpgkgfgdhefegpefgogefkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghejaaaihdhegbhcheedgpgmemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhed
lhihcaagcgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaaahihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaaaaaaaaaaaaaabacaaalfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfa
gmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapaaaappppppppdchahahahahahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaaaaaaaaaaaaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdhfgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachaaaaaaaaaaaaaaaaahdhbaahoaaaaaaaaaaabhhaeaaaaaaakhdhcaabbgkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailacaaaahihaaaaaaaaahihihdhbaahoaaaaaaaaaaabhhaeaaaaaaakhbaahoaablhihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhbaahoaablhbaahoaaaphihdhbaahoaaaaaaa
aaaaahhaeaaaaaaakhihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahiaahahi','','b','scope','true')) - scope-102
\ No newline at end of file
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Sort.gld Tue May 3 16:53:40 2011
@@ -1,5 +1,7 @@
-POSort[bag]() - Test-Plan-Builder-28
-| |
-| Project[bytearray][0] - Test-Plan-Builder-27
+test-4: Store()
|
-|---23: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-26
+|---test-3: POSort[bag]() - scope-11
+ | |
+ | Project[bytearray][0] - scope-10
+ |
+ |---test-2: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Split1.gld Tue May 3 16:53:40 2011
@@ -1,23 +1,29 @@
-y: Filter[tuple] - Test-Plan-Builder-240
+y: Filter[bag] - scope-157
| |
-| Greater Than[boolean] - Test-Plan-Builder-243
+| Greater Than[boolean] - scope-161
| |
-| |---Project[bytearray][0] - Test-Plan-Builder-241
+| |---Cast[chararray] - scope-159
+| | |
+| | |---Project[bytearray][0] - scope-158
| |
-| |---Constant(7) - Test-Plan-Builder-242
+| |---Constant(7) - scope-160
|
-|---Split - Test-Plan-Builder-239
+|---test-24: Split - scope-156
|
- |---229: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-238
+ |---test-23: Load()
-x: Filter[tuple] - Test-Plan-Builder-244
-| |
-| Less Than[boolean] - Test-Plan-Builder-247
-| |
-| |---Project[bytearray][0] - Test-Plan-Builder-245
-| |
-| |---Constant(7) - Test-Plan-Builder-246
+test-25: Store()
|
-|---Split - Test-Plan-Builder-239
+|---x: Filter[bag] - scope-162
+ | |
+ | Less Than[boolean] - scope-166
+ | |
+ | |---Cast[chararray] - scope-164
+ | | |
+ | | |---Project[bytearray][0] - scope-163
+ | |
+ | |---Constant(7) - scope-165
|
- |---229: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-238
+ |---test-24: Split - scope-156
+ |
+ |---test-23: Load()
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/Union.gld Tue May 3 16:53:40 2011
@@ -1,7 +1,9 @@
-Union[bag] - Test-Plan-Builder-228
+test-22: Store()
|
-|---221: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-225
-|
-|---222: Load(file:///homes/rding/apache-pig/trunk/b:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-226
-|
-|---223: Load(file:///homes/rding/apache-pig/trunk/c:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-227
+|---A: Union[bag] - scope-153
+ |
+ |---test-19: Load()
+ |
+ |---test-20: Load()
+ |
+ |---test-21: Load()
Modified: pig/trunk/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java?rev=1099121&r1=1099120&r2=1099121&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java (original)
+++ pig/trunk/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java Tue May 3 16:53:40 2011
@@ -18,41 +18,21 @@
package org.apache.pig.test.utils;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Properties;
-import org.apache.hadoop.mapred.lib.FieldSelectionMapReduce;
import org.apache.pig.FuncSpec;
-import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
import org.apache.pig.builtin.PigStorage;
import org.apache.pig.impl.io.FileSpec;
-import org.apache.pig.impl.logicalLayer.LOLoad;
-import org.apache.pig.impl.logicalLayer.LogicalPlan;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.CompilationMessageCollector;
import org.apache.pig.impl.plan.NodeIdGenerator;
import org.apache.pig.impl.plan.OperatorKey;
-import org.apache.pig.parser.QueryParser.or_cond_return;
-import org.apache.pig.test.TypeGraphPrinter;
+import org.apache.pig.newplan.logical.relational.LogicalPlan;
public class TypeCheckingTestUtil {
- public static LOLoad genDummyLOLoad(LogicalPlan plan) {
- String pigStorage = PigStorage.class.getName() ;
- try {
- LOLoad load = new LOLoad(plan,
- genNewOperatorKey(),
- new FileSpec("pi", new FuncSpec(pigStorage)),
- ConfigurationUtil.toConfiguration(new Properties())) ;
- return load ;
- } catch (IOException e) {
- throw new AssertionError("This cannot happen") ;
- }
- }
-
public static org.apache.pig.newplan.logical.relational.LOLoad
genDummyLOLoadNewLP( org.apache.pig.newplan.logical.relational.LogicalPlan plan) {
String pigStorage = PigStorage.class.getName() ;
@@ -90,8 +70,7 @@ public class TypeCheckingTestUtil {
public static void printTypeGraph(LogicalPlan plan) {
System.out.println("*****Type Graph*******") ;
- TypeGraphPrinter printer = new TypeGraphPrinter(plan) ;
- String rep = printer.printToString() ;
+ String rep = plan.toString() ;
System.out.println(rep) ;
}