You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2008/06/26 22:05:26 UTC
svn commit: r672016 [4/4] - in /incubator/pig/branches/types: ./
src/org/apache/pig/ src/org/apache/pig/impl/logicalLayer/
src/org/apache/pig/impl/logicalLayer/parser/
src/org/apache/pig/impl/logicalLayer/validators/
src/org/apache/pig/impl/mapReduceLa...
Modified: incubator/pig/branches/types/test/org/apache/pig/test/TestPONegative.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestPONegative.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestPONegative.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestPONegative.java Thu Jun 26 13:05:23 2008
@@ -27,7 +27,7 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
import org.apache.pig.impl.plan.OperatorKey;
-import org.apache.pig.impl.physicalLayer.plans.ExprPlan;
+import org.apache.pig.impl.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.impl.physicalLayer.expressionOperators.POProject;
import org.apache.pig.impl.physicalLayer.expressionOperators.PONegative;
import org.apache.pig.impl.plan.PlanException;
@@ -54,7 +54,7 @@
PONegative pn = new PONegative(new OperatorKey("", r.nextLong()), -1, prj);
pn.setResultType(DataType.INTEGER);
- ExprPlan plan = new ExprPlan();
+ PhysicalPlan plan = new PhysicalPlan();
plan.add(prj); plan.add(pn);
plan.connect(prj, pn);
@@ -80,7 +80,7 @@
PONegative pn = new PONegative(new OperatorKey("", r.nextLong()), -1, prj);
pn.setResultType(DataType.LONG);
- ExprPlan plan = new ExprPlan();
+ PhysicalPlan plan = new PhysicalPlan();
plan.add(prj); plan.add(pn);
plan.connect(prj, pn);
@@ -106,7 +106,7 @@
PONegative pn = new PONegative(new OperatorKey("", r.nextLong()), -1, prj);
pn.setResultType(DataType.DOUBLE);
- ExprPlan plan = new ExprPlan();
+ PhysicalPlan plan = new PhysicalPlan();
plan.add(prj); plan.add(pn);
plan.connect(prj, pn);
@@ -132,7 +132,7 @@
PONegative pn = new PONegative(new OperatorKey("", r.nextLong()), -1, prj);
pn.setResultType(DataType.FLOAT);
- ExprPlan plan = new ExprPlan();
+ PhysicalPlan plan = new PhysicalPlan();
plan.add(prj); plan.add(pn);
plan.connect(prj, pn);
Modified: incubator/pig/branches/types/test/org/apache/pig/test/TestPOSort.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestPOSort.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestPOSort.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestPOSort.java Thu Jun 26 13:05:23 2008
@@ -32,7 +32,7 @@
import org.apache.pig.impl.physicalLayer.PhysicalOperator;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
-import org.apache.pig.impl.physicalLayer.plans.ExprPlan;
+import org.apache.pig.impl.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.impl.physicalLayer.relationalOperators.PORead;
import org.apache.pig.impl.physicalLayer.relationalOperators.POSort;
import org.apache.pig.impl.physicalLayer.expressionOperators.POProject;
@@ -49,10 +49,10 @@
public void testPOSortAscString() throws ExecException {
DataBag input = (DataBag) GenRandomData.genRandSmallTupDataBag(r,
MAX_TUPLES, 100);
- List<ExprPlan> sortPlans = new LinkedList<ExprPlan>();
+ List<PhysicalPlan> sortPlans = new LinkedList<PhysicalPlan>();
POProject pr1 = new POProject(new OperatorKey("", r.nextLong()), -1, 0);
pr1.setResultType(DataType.CHARARRAY);
- ExprPlan expPlan = new ExprPlan();
+ PhysicalPlan expPlan = new PhysicalPlan();
expPlan.add(pr1);
sortPlans.add(expPlan);
List<Boolean> mAscCols = new LinkedList<Boolean>();
@@ -81,10 +81,10 @@
public void testPOSortDescString() throws ExecException {
DataBag input = (DataBag) GenRandomData.genRandSmallTupDataBag(r,
MAX_TUPLES, 100);
- List<ExprPlan> sortPlans = new LinkedList<ExprPlan>();
+ List<PhysicalPlan> sortPlans = new LinkedList<PhysicalPlan>();
POProject pr1 = new POProject(new OperatorKey("", r.nextLong()), -1, 0);
pr1.setResultType(DataType.CHARARRAY);
- ExprPlan expPlan = new ExprPlan();
+ PhysicalPlan expPlan = new PhysicalPlan();
expPlan.add(pr1);
sortPlans.add(expPlan);
List<Boolean> mAscCols = new LinkedList<Boolean>();
@@ -113,10 +113,10 @@
public void testPOSortAsc() throws ExecException {
DataBag input = (DataBag) GenRandomData.genRandSmallTupDataBag(r,
MAX_TUPLES, 100);
- List<ExprPlan> sortPlans = new LinkedList<ExprPlan>();
+ List<PhysicalPlan> sortPlans = new LinkedList<PhysicalPlan>();
POProject pr1 = new POProject(new OperatorKey("", r.nextLong()), -1, 1);
pr1.setResultType(DataType.INTEGER);
- ExprPlan expPlan = new ExprPlan();
+ PhysicalPlan expPlan = new PhysicalPlan();
expPlan.add(pr1);
sortPlans.add(expPlan);
List<Boolean> mAscCols = new LinkedList<Boolean>();
@@ -145,10 +145,10 @@
public void testPOSortDesc() throws ExecException {
DataBag input = (DataBag) GenRandomData.genRandSmallTupDataBag(r,
MAX_TUPLES, 100);
- List<ExprPlan> sortPlans = new LinkedList<ExprPlan>();
+ List<PhysicalPlan> sortPlans = new LinkedList<PhysicalPlan>();
POProject pr1 = new POProject(new OperatorKey("", r.nextLong()), -1, 1);
pr1.setResultType(DataType.INTEGER);
- ExprPlan expPlan = new ExprPlan();
+ PhysicalPlan expPlan = new PhysicalPlan();
expPlan.add(pr1);
sortPlans.add(expPlan);
List<Boolean> mAscCols = new LinkedList<Boolean>();
Modified: incubator/pig/branches/types/test/org/apache/pig/test/TestPOUserFunc.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestPOUserFunc.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestPOUserFunc.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestPOUserFunc.java Thu Jun 26 13:05:23 2008
@@ -238,7 +238,7 @@
while (res.returnStatus != POStatus.STATUS_EOP) {
// System.out.println(res.result);
int result = (Integer) res.result;
- assertEquals(1, result);
+ assertEquals(2, result);
res = userFunc.getNext(i);
}
}
Modified: incubator/pig/branches/types/test/org/apache/pig/test/TestPhyOp.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestPhyOp.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestPhyOp.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestPhyOp.java Thu Jun 26 13:05:23 2008
@@ -38,9 +38,9 @@
import org.junit.Test;
public class TestPhyOp extends junit.framework.TestCase {
- PhysicalOperator<PhyPlanVisitor> op;
+ PhysicalOperator op;
- PhysicalOperator<PhyPlanVisitor> inpOp;
+ PhysicalOperator inpOp;
Tuple t;
Modified: incubator/pig/branches/types/test/org/apache/pig/test/TestTypeCheckingValidator.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestTypeCheckingValidator.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestTypeCheckingValidator.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestTypeCheckingValidator.java Thu Jun 26 13:05:23 2008
@@ -790,7 +790,7 @@
}
*/
-
+
// This tests when both inputs need casting
@Test
public void testUnionCastingInsert1() throws Throwable {
@@ -1017,7 +1017,7 @@
}
}
-
+
// This has to fail under strict typing mode
/*
// This is a negative test
@@ -2239,7 +2239,6 @@
assertEquals(innerPlan12.getSingleLeafPlanOutputType(), DataType.BYTEARRAY) ;
}
-
// Positive test
@Test
public void testForEachGenerate1() throws Throwable {
@@ -2307,14 +2306,8 @@
flattens.add(true) ;
flattens.add(false) ;
- // Create LOGenerate
- LOGenerate generate1 = new LOGenerate(plan, genNewOperatorKey(), generatePlans, flattens) ;
-
- LogicalPlan foreachPlan = new LogicalPlan() ;
- foreachPlan.add(generate1) ;
-
// Create LOForEach
- LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), foreachPlan) ;
+ LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), generatePlans, flattens) ;
// construct the main plan
plan.add(load1) ;
@@ -2407,14 +2400,8 @@
flattens.add(true) ;
flattens.add(false) ;
- // Create LOGenerate
- LOGenerate generate1 = new LOGenerate(plan, genNewOperatorKey(), generatePlans, flattens) ;
-
- LogicalPlan foreachPlan = new LogicalPlan() ;
- foreachPlan.add(generate1) ;
-
// Create LOForEach
- LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), foreachPlan) ;
+ LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), generatePlans, flattens) ;
// construct the main plan
plan.add(load1) ;
@@ -2616,14 +2603,8 @@
flattens.add(true) ;
flattens.add(false) ;
- // Create LOGenerate
- LOGenerate generate1 = new LOGenerate(plan, genNewOperatorKey(), generatePlans, flattens) ;
-
- LogicalPlan foreachPlan = new LogicalPlan() ;
- foreachPlan.add(generate1) ;
-
// Create LOForEach
- LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), foreachPlan) ;
+ LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), generatePlans, flattens) ;
// construct the main plan
plan.add(load1) ;
@@ -2706,8 +2687,7 @@
////////////////////////// Helper //////////////////////////////////
private void checkForEachCasting(LOForEach foreach, int idx, boolean isCast, byte toType) {
- LOGenerate generate = (LOGenerate) foreach.getForEachPlan().getRoots().get(0) ;
- LogicalPlan plan = generate.getGeneratePlans().get(idx) ;
+ LogicalPlan plan = foreach.getForEachPlans().get(idx) ;
if (isCast) {
List<LogicalOperator> leaveList = plan.getLeaves() ;
@@ -2722,6 +2702,5 @@
}
}
-
}
Modified: incubator/pig/branches/types/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java Thu Jun 26 13:05:23 2008
@@ -968,14 +968,8 @@
flattens.add(true) ;
flattens.add(false) ;
- // Create LOGenerate
- LOGenerate generate1 = new LOGenerate(plan, genNewOperatorKey(), generatePlans, flattens) ;
-
- LogicalPlan foreachPlan = new LogicalPlan() ;
- foreachPlan.add(generate1) ;
-
// Create LOForEach
- LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), foreachPlan) ;
+ LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), generatePlans, flattens) ;
// construct the main plan
plan.add(load1) ;
Modified: incubator/pig/branches/types/test/org/apache/pig/test/TestUnion.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestUnion.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestUnion.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestUnion.java Thu Jun 26 13:05:23 2008
@@ -110,7 +110,7 @@
sp = GenPhyOp.topUnionOp();
- PhysicalPlan<PhysicalOperator> plan = new PhysicalPlan<PhysicalOperator>();
+ PhysicalPlan plan = new PhysicalPlan();
plan.add(ld1);
plan.add(ld2);
Modified: incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java Thu Jun 26 13:05:23 2008
@@ -85,14 +85,14 @@
}
}
- protected void visit(LOGenerate op) throws VisitorException {
+ protected void visit(LOForEach op) throws VisitorException {
appendOp(op) ;
- List<LogicalPlan> plans = op.getGeneratePlans() ;
+ List<LogicalPlan> plans = op.getForEachPlans() ;
if (plans != null) {
for (LogicalPlan plan: plans) {
currentTabCount++ ;
printTabs() ;
- sb.append("<Generate Inner Plan>\n") ;
+ sb.append("<ForEach Inner Plan>\n") ;
pushWalker(mCurrentWalker.spawnChildWalker(plan)) ;
visit();
popWalker();
@@ -122,6 +122,7 @@
appendOp(op) ;
}
+ /*
protected void visit(LOForEach op) throws VisitorException {
appendOp(op) ;
if (op.getForEachPlan() != null) {
@@ -134,6 +135,7 @@
currentTabCount-- ;
}
}
+ */
protected void visit(LOUserFunc op) {
appendOp(op) ;
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld Thu Jun 26 13:05:23 2008
@@ -1,27 +1,25 @@
-For Each[tuple] - Test-Plan-Builder-88
+New For Each(false,false,false)[bag] - Test-Plan-Builder-86
| |
-| POGenerate(false,false,false) - Test-Plan-Builder-87
-| | |
-| | Add[Unknown] - Test-Plan-Builder-80
-| | |
-| | |---Add[Unknown] - Test-Plan-Builder-78
-| | | |
-| | | |---Project[bytearray](0) - Test-Plan-Builder-76
-| | | |
-| | | |---Project[bytearray](1) - Test-Plan-Builder-77
-| | |
-| | |---Constant(5) - Test-Plan-Builder-79
+| Add[Unknown] - Test-Plan-Builder-79
+| |
+| |---Add[Unknown] - Test-Plan-Builder-77
| | |
-| | Subtract[Unknown] - Test-Plan-Builder-85
+| | |---Project[bytearray](0) - Test-Plan-Builder-75
| | |
-| | |---Subtract[Unknown] - Test-Plan-Builder-83
-| | | |
-| | | |---Project[bytearray](0) - Test-Plan-Builder-81
-| | | |
-| | | |---Constant(5) - Test-Plan-Builder-82
+| | |---Project[bytearray](1) - Test-Plan-Builder-76
+| |
+| |---Constant(5) - Test-Plan-Builder-78
+| |
+| Subtract[Unknown] - Test-Plan-Builder-84
+| |
+| |---Subtract[Unknown] - Test-Plan-Builder-82
| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-84
+| | |---Project[bytearray](0) - Test-Plan-Builder-80
| | |
-| | Constant(hello) - Test-Plan-Builder-86
+| | |---Constant(5) - Test-Plan-Builder-81
+| |
+| |---Project[bytearray](1) - Test-Plan-Builder-83
+| |
+| Constant(hello) - Test-Plan-Builder-85
|
-|---Load(A:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-75
\ No newline at end of file
+|---Load(A:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-74
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld Thu Jun 26 13:05:23 2008
@@ -1,25 +1,23 @@
-For Each[tuple] - Test-Plan-Builder-140
+New For Each(false)[bag] - Test-Plan-Builder-137
| |
-| POGenerate(false) - Test-Plan-Builder-139
+| POBinCond[Unknown] - Test-Plan-Builder-136
+| |
+| |---Equal To[tuple] - Test-Plan-Builder-129
| | |
-| | POBinCond[Unknown] - Test-Plan-Builder-138
+| | |---Project[bytearray](1) - Test-Plan-Builder-127
| | |
-| | |---Equal To[tuple] - Test-Plan-Builder-131
-| | | |
-| | | |---Project[bytearray](1) - Test-Plan-Builder-129
-| | | |
-| | | |---Constant(3) - Test-Plan-Builder-130
+| | |---Constant(3) - Test-Plan-Builder-128
+| |
+| |---Add[Unknown] - Test-Plan-Builder-132
| | |
-| | |---Add[Unknown] - Test-Plan-Builder-134
-| | | |
-| | | |---Project[bytearray](2) - Test-Plan-Builder-132
-| | | |
-| | | |---Project[bytearray](3) - Test-Plan-Builder-133
+| | |---Project[bytearray](2) - Test-Plan-Builder-130
| | |
-| | |---Subtract[Unknown] - Test-Plan-Builder-137
-| | |
-| | |---Project[bytearray](2) - Test-Plan-Builder-135
-| | |
-| | |---Project[bytearray](3) - Test-Plan-Builder-136
+| | |---Project[bytearray](3) - Test-Plan-Builder-131
+| |
+| |---Subtract[Unknown] - Test-Plan-Builder-135
+| |
+| |---Project[bytearray](2) - Test-Plan-Builder-133
+| |
+| |---Project[bytearray](3) - Test-Plan-Builder-134
|
-|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-128
\ No newline at end of file
+|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-126
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld Thu Jun 26 13:05:23 2008
@@ -1,35 +1,35 @@
-Package[tuple]{tuple} - Test-Plan-Builder-46
+Package[tuple]{tuple} - Test-Plan-Builder-45
|
-|---Global Rearrange[tuple] - Test-Plan-Builder-45
+|---Global Rearrange[tuple] - Test-Plan-Builder-44
|
- |---Local Rearrange[tuple]{tuple} - Test-Plan-Builder-47
+ |---Local Rearrange[tuple]{tuple} - Test-Plan-Builder-46
| | |
- | | Add[Unknown] - Test-Plan-Builder-50
+ | | Add[Unknown] - Test-Plan-Builder-49
| | |
- | | |---Project[bytearray](0) - Test-Plan-Builder-48
+ | | |---Project[bytearray](0) - Test-Plan-Builder-47
| | |
- | | |---Project[bytearray](1) - Test-Plan-Builder-49
+ | | |---Project[bytearray](1) - Test-Plan-Builder-48
| | |
- | | Subtract[Unknown] - Test-Plan-Builder-53
+ | | Subtract[Unknown] - Test-Plan-Builder-52
| | |
- | | |---Project[bytearray](0) - Test-Plan-Builder-51
+ | | |---Project[bytearray](0) - Test-Plan-Builder-50
| | |
- | | |---Project[bytearray](1) - Test-Plan-Builder-52
+ | | |---Project[bytearray](1) - Test-Plan-Builder-51
| |
- | |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-43
+ | |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-42
|
- |---Local Rearrange[tuple]{tuple} - Test-Plan-Builder-54
+ |---Local Rearrange[tuple]{tuple} - Test-Plan-Builder-53
| |
- | Add[Unknown] - Test-Plan-Builder-57
+ | Add[Unknown] - Test-Plan-Builder-56
| |
- | |---Project[bytearray](0) - Test-Plan-Builder-55
+ | |---Project[bytearray](0) - Test-Plan-Builder-54
| |
- | |---Project[bytearray](1) - Test-Plan-Builder-56
+ | |---Project[bytearray](1) - Test-Plan-Builder-55
| |
- | Subtract[Unknown] - Test-Plan-Builder-60
+ | Subtract[Unknown] - Test-Plan-Builder-59
| |
- | |---Project[bytearray](0) - Test-Plan-Builder-58
+ | |---Project[bytearray](0) - Test-Plan-Builder-57
| |
- | |---Project[bytearray](1) - Test-Plan-Builder-59
+ | |---Project[bytearray](1) - Test-Plan-Builder-58
|
- |---Load(b:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-44
\ No newline at end of file
+ |---Load(b:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-43
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld Thu Jun 26 13:05:23 2008
@@ -1,25 +1,25 @@
-Filter[bag] - Test-Plan-Builder-103
+Filter[bag] - Test-Plan-Builder-101
| |
-| Greater Than[tuple] - Test-Plan-Builder-114
+| Greater Than[tuple] - Test-Plan-Builder-112
| |
-| |---Add[Unknown] - Test-Plan-Builder-106
+| |---Add[Unknown] - Test-Plan-Builder-104
| | |
-| | |---Project[bytearray](0) - Test-Plan-Builder-104
+| | |---Project[bytearray](0) - Test-Plan-Builder-102
| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-105
+| | |---Project[bytearray](1) - Test-Plan-Builder-103
| |
-| |---Multiply[Unknown] - Test-Plan-Builder-113
+| |---Multiply[Unknown] - Test-Plan-Builder-111
| |
-| |---Subtract[Unknown] - Test-Plan-Builder-109
+| |---Subtract[Unknown] - Test-Plan-Builder-107
| | |
-| | |---Project[bytearray](0) - Test-Plan-Builder-107
+| | |---Project[bytearray](0) - Test-Plan-Builder-105
| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-108
+| | |---Project[bytearray](1) - Test-Plan-Builder-106
| |
-| |---Divide[Unknown] - Test-Plan-Builder-112
+| |---Divide[Unknown] - Test-Plan-Builder-110
| |
-| |---Constant(4) - Test-Plan-Builder-110
+| |---Constant(4) - Test-Plan-Builder-108
| |
-| |---Constant(2) - Test-Plan-Builder-111
+| |---Constant(2) - Test-Plan-Builder-109
|
-|---Load(a:org.apache.pig.builtin.PigStorage(':')) - Test-Plan-Builder-102
\ No newline at end of file
+|---Load(a:org.apache.pig.builtin.PigStorage(':')) - Test-Plan-Builder-100
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld Thu Jun 26 13:05:23 2008
@@ -1,8 +1,6 @@
-For Each[tuple] - Test-Plan-Builder-17
+New For Each(false)[bag] - Test-Plan-Builder-16
| |
-| POGenerate(false) - Test-Plan-Builder-16
-| | |
-| | Project[bag](*) - Test-Plan-Builder-15
+| Project[tuple](*) - Test-Plan-Builder-15
| |
| |---Filter[bag] - Test-Plan-Builder-11
| | |
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld Thu Jun 26 13:05:23 2008
@@ -1,3 +1,3 @@
-PODistinct[bag] - Test-Plan-Builder-27
+PODistinct[bag] - Test-Plan-Builder-26
|
-|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-26
\ No newline at end of file
+|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-25
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld Thu Jun 26 13:05:23 2008
@@ -1,39 +1,37 @@
-For Each[tuple] - Test-Plan-Builder-180
+New For Each(false,false,false,false,false,false)[bag] - Test-Plan-Builder-176
| |
-| POGenerate(false,false,false,false,false,false) - Test-Plan-Builder-179
-| | |
-| | Add[Unknown] - Test-Plan-Builder-164
-| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-162
-| | |
-| | |---Project[bytearray](2) - Test-Plan-Builder-163
-| | |
-| | Subtract[Unknown] - Test-Plan-Builder-167
-| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-165
-| | |
-| | |---Project[bytearray](2) - Test-Plan-Builder-166
-| | |
-| | Multiply[Unknown] - Test-Plan-Builder-170
-| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-168
-| | |
-| | |---Project[bytearray](2) - Test-Plan-Builder-169
-| | |
-| | Divide[Unknown] - Test-Plan-Builder-173
-| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-171
-| | |
-| | |---Project[bytearray](2) - Test-Plan-Builder-172
-| | |
-| | Mod[Unknown] - Test-Plan-Builder-176
-| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-174
-| | |
-| | |---Project[bytearray](2) - Test-Plan-Builder-175
-| | |
-| | PONegative[tuple] - Test-Plan-Builder-178
-| | |
-| | |---Project[bytearray](1) - Test-Plan-Builder-177
+| Add[Unknown] - Test-Plan-Builder-161
+| |
+| |---Project[bytearray](1) - Test-Plan-Builder-159
+| |
+| |---Project[bytearray](2) - Test-Plan-Builder-160
+| |
+| Subtract[Unknown] - Test-Plan-Builder-164
+| |
+| |---Project[bytearray](1) - Test-Plan-Builder-162
+| |
+| |---Project[bytearray](2) - Test-Plan-Builder-163
+| |
+| Multiply[Unknown] - Test-Plan-Builder-167
+| |
+| |---Project[bytearray](1) - Test-Plan-Builder-165
+| |
+| |---Project[bytearray](2) - Test-Plan-Builder-166
+| |
+| Divide[Unknown] - Test-Plan-Builder-170
+| |
+| |---Project[bytearray](1) - Test-Plan-Builder-168
+| |
+| |---Project[bytearray](2) - Test-Plan-Builder-169
+| |
+| Mod[Unknown] - Test-Plan-Builder-173
+| |
+| |---Project[bytearray](1) - Test-Plan-Builder-171
+| |
+| |---Project[bytearray](2) - Test-Plan-Builder-172
+| |
+| PONegative[tuple] - Test-Plan-Builder-175
+| |
+| |---Project[bytearray](1) - Test-Plan-Builder-174
|
-|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-161
\ No newline at end of file
+|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-158
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld Thu Jun 26 13:05:23 2008
@@ -1,21 +1,21 @@
-Filter[tuple] - Test-Plan-Builder-218
+Filter[tuple] - Test-Plan-Builder-214
| |
-| Not[boolean] - Test-Plan-Builder-221
+| POIsNull[tuple] - Test-Plan-Builder-216
| |
-| |---POIsNull[tuple] - Test-Plan-Builder-220
-| |
-| |---Project[bytearray](0) - Test-Plan-Builder-219
+| |---Project[bytearray](0) - Test-Plan-Builder-215
|
-|---Split - Test-Plan-Builder-217
+|---Split - Test-Plan-Builder-213
|
- |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-216
+ |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-212
-Filter[tuple] - Test-Plan-Builder-222
+Filter[tuple] - Test-Plan-Builder-217
| |
-| POIsNull[tuple] - Test-Plan-Builder-224
+| Not[boolean] - Test-Plan-Builder-220
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-223
+| |---POIsNull[tuple] - Test-Plan-Builder-219
+| |
+| |---Project[bytearray](0) - Test-Plan-Builder-218
|
-|---Split - Test-Plan-Builder-217
+|---Split - Test-Plan-Builder-213
|
- |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-216
+ |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-212
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld Thu Jun 26 13:05:23 2008
@@ -1,21 +1,21 @@
-Filter[tuple] - Test-Plan-Builder-218
+Filter[tuple] - Test-Plan-Builder-214
| |
-| POIsNull[tuple] - Test-Plan-Builder-220
+| Not[boolean] - Test-Plan-Builder-217
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-219
+| |---POIsNull[tuple] - Test-Plan-Builder-216
+| |
+| |---Project[bytearray](0) - Test-Plan-Builder-215
|
-|---Split - Test-Plan-Builder-217
+|---Split - Test-Plan-Builder-213
|
- |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-216
+ |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-212
-Filter[tuple] - Test-Plan-Builder-221
+Filter[tuple] - Test-Plan-Builder-218
| |
-| Not[boolean] - Test-Plan-Builder-224
+| POIsNull[tuple] - Test-Plan-Builder-220
| |
-| |---POIsNull[tuple] - Test-Plan-Builder-223
-| |
-| |---Project[bytearray](0) - Test-Plan-Builder-222
+| |---Project[bytearray](0) - Test-Plan-Builder-219
|
-|---Split - Test-Plan-Builder-217
+|---Split - Test-Plan-Builder-213
|
- |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-216
+ |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-212
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld Thu Jun 26 13:05:23 2008
@@ -1,19 +1,19 @@
-MapReduce(-1,GFCross) - -170:
+MapReduce(-1,GFCross) - -166:
| Store(DummyFil:DummyLdr) - -5165956429696944631
| |
| |---For Each[tuple] - -2197807331204639125
| | |
| | POGenerate(false) - --8447156979210379761
| | | |
-| | | POUserFunc(org.apache.pig.impl.builtin.GFCross) - -6139496040975471496
+| | | POUserFunc(org.apache.pig.impl.builtin.GFCross)[tuple] - -6139496040975471496
| | | |
| | | |---Project[tuple](*) - -5878058249424113280
| |
| |---Package[tuple]{Unknown} - -7085374960058856883
-| Load(/tmp/temp-1456742965/tmp-586682361:org.apache.pig.builtin.BinStorage) - -169
+| Load(/tmp/temp-1456742965/tmp-586682361:org.apache.pig.builtin.BinStorage) - -165
|
-|---MapReduce(-1,AVG) - -167:
- | Store(/tmp/temp-1456742965/tmp-586682361:org.apache.pig.builtin.BinStorage) - -168
+|---MapReduce(-1,AVG) - -163:
+ | Store(/tmp/temp-1456742965/tmp-586682361:org.apache.pig.builtin.BinStorage) - -164
| |
| |---Local Rearrange[tuple]{Unknown} - -7398260302074824818
| |
@@ -21,15 +21,15 @@
| | |
| | POGenerate(false) - -7973970339130605847
| | | |
- | | | POUserFunc(org.apache.pig.builtin.AVG) - --6860857982727545176
+ | | | POUserFunc(org.apache.pig.builtin.AVG)[tuple] - --6860857982727545176
| | | |
| | | |---Project[tuple](*) - -2082992246427879202
| |
| |---Package[tuple]{Unknown} - -737965411848544085
- | Load(/tmp/temp-1456742965/tmp-26634357:org.apache.pig.builtin.BinStorage) - -166
+ | Load(/tmp/temp-1456742965/tmp-26634357:org.apache.pig.builtin.BinStorage) - -162
|
- |---MapReduce(20,FindQuantiles,SUM) - -158:
- | Store(/tmp/temp-1456742965/tmp-26634357:org.apache.pig.builtin.BinStorage) - -165
+ |---MapReduce(20,FindQuantiles,SUM) - -155:
+ | Store(/tmp/temp-1456742965/tmp-26634357:org.apache.pig.builtin.BinStorage) - -161
| |
| |---Local Rearrange[tuple]{Unknown} - --3359714221559579809
| |
@@ -37,62 +37,48 @@
| | |
| | POGenerate(false,false) - -8639002377389679348
| | | |
- | | | POUserFunc(org.apache.pig.impl.builtin.FindQuantiles) - -727770031531364881
+ | | | POUserFunc(org.apache.pig.impl.builtin.FindQuantiles)[tuple] - -727770031531364881
| | | |
| | | |---Project[tuple](*) - -7128285064986147947
| | | |
- | | | POUserFunc(org.apache.pig.builtin.SUM) - --5683415113785058706
+ | | | POUserFunc(org.apache.pig.builtin.SUM)[tuple] - --5683415113785058706
| | | |
| | | |---Project[tuple](*) - --8002381389674382470
| |
- | |---For Each[tuple] - -164
+ | |---New For Each(true)[tuple] - -160
| | |
- | | POGenerate(true) - -163
- | | | |
- | | | Project[bag](1) - -162
+ | | Project[bag](1) - -159
| |
- | |---Package[tuple]{bytearray} - -161
- | Local Rearrange[tuple]{bytearray} - -160
+ | |---Package[tuple]{bytearray} - -158
+ | Local Rearrange[tuple]{bytearray} - -157
| | |
- | | Project[bytearray](0) - -159
+ | | Project[bytearray](0) - -156
| |
- | |---Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -157
+ | |---Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -154
|
|---MapReduce(-1,FindQuantiles,TestMRCompiler$WeirdComparator) - -139:
- | Store(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -156
+ | Store(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -153
| |
- | |---For Each[tuple] - -155
+ | |---New For Each(false)[tuple] - -152
| | |
- | | POGenerate(false) - -154
- | | | |
- | | | POUserFunc(org.apache.pig.impl.builtin.FindQuantiles) - -153
- | | | |
- | | | |---Project[tuple](*) - -152
+ | | POUserFunc(org.apache.pig.impl.builtin.FindQuantiles)[tuple] - -151
+ | | |
+ | | |---Project[tuple](*) - -150
| |
- | |---For Each[tuple] - -151
+ | |---New For Each(false,false)[tuple] - -149
| | |
- | | POGenerate(false,false) - -150
- | | | |
- | | | Constant(20) - -149
- | | | |
- | | | Project[bag](0) - -148
+ | | Constant(20) - -148
| | |
- | | |---POSort[tuple] - --776319888013965510
- | | | |
- | | | Project[tuple](*) - -147
- | | |
- | | |---Project[tuple](1) - -146
+ | | Project[bag](1) - -147
| |
- | |---Package[tuple]{chararray} - -145
- | Local Rearrange[tuple]{chararray} - -144
+ | |---Package[tuple]{chararray} - -144
+ | Local Rearrange[tuple]{chararray} - -143
| | |
- | | Constant(all) - -143
+ | | Constant(all) - -142
| |
- | |---For Each[tuple] - -142
+ | |---New For Each(true)[tuple] - -141
| | |
- | | POGenerate(true) - -141
- | | | |
- | | | Project[bytearray](0) - -140
+ | | Project[bytearray](0) - -140
| |
| |---Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.builtin.RandomSampleLoader) - -138
|
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld Thu Jun 26 13:05:23 2008
@@ -1,40 +1,36 @@
-MapReduce(-1) - -185:
+MapReduce(-1) - -180:
| Store(DummyFil:DummyLdr) - -6079615556647418436
| |
-| |---For Each[tuple] - -189
+| |---New For Each(false)[bag] - -183
| | |
-| | POGenerate(false) - -188
-| | | |
-| | | Project[tuple](0) - -187
+| | Project[tuple](0) - -182
| |
-| |---Package[tuple]{tuple} - -186
-| Load(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -184
+| |---Package[tuple]{tuple} - -181
+| Load(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -179
|
-|---MapReduce(-1) - -180:
- | Store(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -183
+|---MapReduce(-1) - -175:
+ | Store(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) - -178
| |
- | |---Local Rearrange[tuple]{tuple} - -182
+ | |---Local Rearrange[tuple]{tuple} - -177
| | |
- | | Project[tuple](*) - -181
+ | | Project[tuple](*) - -176
| |
| |---Package[tuple]{Unknown} - -8219725798912083822
- | Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -179
+ | Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -174
|
- |---MapReduce(-1) - -171:
- | Store(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -178
+ |---MapReduce(-1) - -167:
+ | Store(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) - -173
| |
| |---Local Rearrange[tuple]{Unknown} - --3889827013424534115
| |
- | |---For Each[tuple] - -177
+ | |---New For Each(false)[bag] - -172
| | |
- | | POGenerate(false) - -176
- | | | |
- | | | Project[tuple](0) - -175
+ | | Project[tuple](0) - -171
| |
- | |---Package[tuple]{tuple} - -174
- | Local Rearrange[tuple]{tuple} - -173
+ | |---Package[tuple]{tuple} - -170
+ | Local Rearrange[tuple]{tuple} - -169
| | |
- | | Project[tuple](*) - -172
+ | | Project[tuple](*) - -168
| |
| |---Filter[tuple] - --1613182091613226659
| |
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Sort.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Sort.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Sort.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Sort.gld Thu Jun 26 13:05:23 2008
@@ -1,5 +1,5 @@
-POSort[bag] - Test-Plan-Builder-23
+POSort[bag] - Test-Plan-Builder-22
| |
-| Project[bytearray](0) - Test-Plan-Builder-22
+| Project[bytearray](0) - Test-Plan-Builder-21
|
-|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-21
\ No newline at end of file
+|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-20
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split1.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split1.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split1.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split1.gld Thu Jun 26 13:05:23 2008
@@ -1,23 +1,23 @@
-Filter[tuple] - Test-Plan-Builder-200
+Filter[tuple] - Test-Plan-Builder-196
| |
-| Greater Than[tuple] - Test-Plan-Builder-203
+| Less Than[tuple] - Test-Plan-Builder-199
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-201
+| |---Project[bytearray](0) - Test-Plan-Builder-197
| |
-| |---Constant(7) - Test-Plan-Builder-202
+| |---Constant(7) - Test-Plan-Builder-198
|
-|---Split - Test-Plan-Builder-199
+|---Split - Test-Plan-Builder-195
|
- |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-198
+ |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-194
-Filter[tuple] - Test-Plan-Builder-204
+Filter[tuple] - Test-Plan-Builder-200
| |
-| Less Than[tuple] - Test-Plan-Builder-207
+| Greater Than[tuple] - Test-Plan-Builder-203
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-205
+| |---Project[bytearray](0) - Test-Plan-Builder-201
| |
-| |---Constant(7) - Test-Plan-Builder-206
+| |---Constant(7) - Test-Plan-Builder-202
|
-|---Split - Test-Plan-Builder-199
+|---Split - Test-Plan-Builder-195
|
- |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-198
\ No newline at end of file
+ |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-194
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split2.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split2.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split2.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split2.gld Thu Jun 26 13:05:23 2008
@@ -1,23 +1,23 @@
-Filter[tuple] - Test-Plan-Builder-200
+Filter[tuple] - Test-Plan-Builder-196
| |
-| Less Than[tuple] - Test-Plan-Builder-203
+| Greater Than[tuple] - Test-Plan-Builder-199
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-201
+| |---Project[bytearray](0) - Test-Plan-Builder-197
| |
-| |---Constant(7) - Test-Plan-Builder-202
+| |---Constant(7) - Test-Plan-Builder-198
|
-|---Split - Test-Plan-Builder-199
+|---Split - Test-Plan-Builder-195
|
- |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-198
+ |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-194
-Filter[tuple] - Test-Plan-Builder-204
+Filter[tuple] - Test-Plan-Builder-200
| |
-| Greater Than[tuple] - Test-Plan-Builder-207
+| Less Than[tuple] - Test-Plan-Builder-203
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-205
+| |---Project[bytearray](0) - Test-Plan-Builder-201
| |
-| |---Constant(7) - Test-Plan-Builder-206
+| |---Constant(7) - Test-Plan-Builder-202
|
-|---Split - Test-Plan-Builder-199
+|---Split - Test-Plan-Builder-195
|
- |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-198
\ No newline at end of file
+ |---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-194
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Union.gld
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Union.gld?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Union.gld (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Union.gld Thu Jun 26 13:05:23 2008
@@ -1,7 +1,7 @@
-Union[bag] - Test-Plan-Builder-188
+Union[bag] - Test-Plan-Builder-184
|
-|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-185
+|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-181
|
-|---Load(b:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-186
+|---Load(b:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-182
|
-|---Load(c:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-187
\ No newline at end of file
+|---Load(c:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-183
\ No newline at end of file
Modified: incubator/pig/branches/types/test/org/apache/pig/test/utils/GenPhyOp.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/utils/GenPhyOp.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/utils/GenPhyOp.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/utils/GenPhyOp.java Thu Jun 26 13:05:23 2008
@@ -34,7 +34,6 @@
import org.apache.pig.impl.plan.OperatorKey;
import org.apache.pig.impl.mapReduceLayer.MapReduceOper;
import org.apache.pig.impl.physicalLayer.PhysicalOperator;
-import org.apache.pig.impl.physicalLayer.plans.ExprPlan;
import org.apache.pig.impl.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.impl.physicalLayer.relationalOperators.*;
import org.apache.pig.impl.physicalLayer.expressionOperators.ConstantExpression;
@@ -50,6 +49,16 @@
public static final byte GT = 2;
public static final byte LTE = 3;
public static final byte LT = 4;
+
+ public static class PlansAndFlattens {
+ public List<PhysicalPlan> plans;
+ public List<Boolean> flattens;
+
+ public PlansAndFlattens(List<PhysicalPlan> p, List<Boolean> f) {
+ plans = p;
+ flattens = f;
+ }
+ };
public static PigContext pc;
// public static MiniCluster cluster = MiniCluster.buildCluster();
@@ -128,28 +137,25 @@
return ret;
}
- public static POGenerate topGenerateOp() {
- POGenerate ret = new POGenerate(new OperatorKey("", r.nextLong()));
- return ret;
- }
-
public static POUnion topUnionOp() {
POUnion ret = new POUnion(new OperatorKey("", r.nextLong()));
return ret;
}
/**
- * creates the POGenerate operator for
+ * creates the PlansAndFlattens struct for
* generate grpCol, *.
*
* @param grpCol - The column to be grouped on
* @param sample - The sample tuple that is used to infer
* result types and #projects for *
- * @return - The POGenerate operator which has the exprplan
+ * @return - The PlansAndFlattens struct which has the exprplan
* for generate grpCol, * set.
* @throws ExecException
*/
- public static POGenerate topGenerateOpWithExPlan(int grpCol, Tuple sample) throws ExecException {
+ public static PlansAndFlattens topGenerateOpWithExPlan(
+ int grpCol,
+ Tuple sample) throws ExecException {
POProject prj1 = new POProject(new OperatorKey("", r.nextLong()), -1, grpCol);
prj1.setResultType(sample.getType(grpCol));
prj1.setOverloaded(false);
@@ -160,10 +166,10 @@
toBeFlattened.add(false);
- ExprPlan plan1 = new ExprPlan();
+ PhysicalPlan plan1 = new PhysicalPlan();
plan1.add(prj1);
- List<ExprPlan> inputs = new LinkedList<ExprPlan>();
+ List<PhysicalPlan> inputs = new LinkedList<PhysicalPlan>();
inputs.add(plan1);
POProject rest[] = new POProject[sample.size()];
@@ -173,7 +179,7 @@
project.setResultType(sample.getType(i));
project.setOverloaded(false);
- ExprPlan pl = new ExprPlan();
+ PhysicalPlan pl = new PhysicalPlan();
pl.add(project);
toBeFlattened.add(false);
@@ -182,24 +188,24 @@
- POGenerate ret = new POGenerate(new OperatorKey("", r.nextLong()),
- inputs, toBeFlattened);
- return ret;
+ return new PlansAndFlattens(inputs, toBeFlattened);
}
/**
- * creates the POGenerate operator for
+ * creates the PlansAndFlattens struct for
* generate grpCol, *.
*
* @param grpCol - The column to be grouped on
* @param sample - The sample tuple that is used to infer
* result types and #projects for *
- * @return - The POGenerate operator which has the exprplan
+ * @return - The PlansAndFlattens struct which has the exprplan
* for generate grpCol, * set.
* @throws ExecException
* @throws PlanException
*/
- public static POGenerate topGenerateOpWithExPlanLR(int grpCol, Tuple sample) throws ExecException, PlanException {
+ public static PlansAndFlattens topGenerateOpWithExPlanLR(
+ int grpCol,
+ Tuple sample) throws ExecException, PlanException {
POProject prj1 = new POProject(new OperatorKey("", r.nextLong()), -1, grpCol);
prj1.setResultType(sample.getType(grpCol));
prj1.setOverloaded(false);
@@ -211,12 +217,12 @@
toBeFlattened.add(false);
- ExprPlan plan1 = new ExprPlan();
+ PhysicalPlan plan1 = new PhysicalPlan();
plan1.add(prj1);
plan1.add(cst);
plan1.connect(prj1, cst);
- List<ExprPlan> inputs = new LinkedList<ExprPlan>();
+ List<PhysicalPlan> inputs = new LinkedList<PhysicalPlan>();
inputs.add(plan1);
POProject rest[] = new POProject[sample.size()];
@@ -230,7 +236,7 @@
csts[i] = new POCastDummy(new OperatorKey("",r.nextLong()));
csts[i].setResultType(sample.getType(i));
- ExprPlan pl = new ExprPlan();
+ PhysicalPlan pl = new PhysicalPlan();
pl.add(project);
pl.add(csts[i]);
pl.connect(project, csts[i]);
@@ -241,23 +247,23 @@
- POGenerate ret = new POGenerate(new OperatorKey("", r.nextLong()),
- inputs, toBeFlattened);
- return ret;
+ return new PlansAndFlattens(inputs, toBeFlattened);
}
/**
- * creates the POGenerate operator for
+ * creates the PlansAndFlattens struct for
* 'generate field'.
*
* @param field - The column to be generated
* @param sample - The sample tuple that is used to infer
* result type
- * @return - The POGenerate operator which has the exprplan
+ * @return - The PlansAndFlattens struct which has the exprplan
* for 'generate field' set.
* @throws ExecException
*/
- public static POGenerate topGenerateOpWithExPlanForFe(int field, Tuple sample) throws ExecException {
+ public static PlansAndFlattens topGenerateOpWithExPlanForFe(
+ int field,
+ Tuple sample) throws ExecException {
POProject prj1 = new POProject(new OperatorKey("", r.nextLong()), -1, field);
prj1.setResultType(sample.getType(field));
prj1.setOverloaded(false);
@@ -268,29 +274,27 @@
toBeFlattened.add(false);
- ExprPlan plan1 = new ExprPlan();
+ PhysicalPlan plan1 = new PhysicalPlan();
plan1.add(prj1);
- List<ExprPlan> inputs = new LinkedList<ExprPlan>();
+ List<PhysicalPlan> inputs = new LinkedList<PhysicalPlan>();
inputs.add(plan1);
- POGenerate ret = new POGenerate(new OperatorKey("", r.nextLong()),
- inputs, toBeFlattened);
- return ret;
+ return new PlansAndFlattens(inputs, toBeFlattened);
}
/**
- * creates the POGenerate operator for
+ * creates the PlansAndFlattens struct for
* 'generate flatten(field)'.
*
* @param field - The column to be generated
* @param sample - The sample tuple that is used to infer
* result type
- * @return - The POGenerate operator which has the exprplan
+ * @return - The PlansAndFlattens struct which has the exprplan
* for 'generate field' set.
* @throws ExecException
*/
- public static POGenerate topGenerateOpWithExPlanForFeFlat(int field) throws ExecException {
+ public static PlansAndFlattens topGenerateOpWithExPlanForFeFlat(int field) throws ExecException {
POProject prj1 = new POProject(new OperatorKey("", r.nextLong()), -1, field);
prj1.setResultType(DataType.BAG);
prj1.setOverloaded(false);
@@ -298,30 +302,30 @@
List<Boolean> toBeFlattened = new LinkedList<Boolean>();
toBeFlattened.add(true);
- ExprPlan plan1 = new ExprPlan();
+ PhysicalPlan plan1 = new PhysicalPlan();
plan1.add(prj1);
- List<ExprPlan> inputs = new LinkedList<ExprPlan>();
+ List<PhysicalPlan> inputs = new LinkedList<PhysicalPlan>();
inputs.add(plan1);
- POGenerate ret = new POGenerate(new OperatorKey("", r.nextLong()),
- inputs, toBeFlattened);
- return ret;
+ return new PlansAndFlattens(inputs, toBeFlattened);
}
/**
- * creates the POGenerate operator for
+ * creates the PlansAndFlattens struct for
* 'generate field[0] field[1] ...'.
*
* @param field - The columns to be generated
* @param sample - The sample tuple that is used to infer
* result type
- * @return - The POGenerate operator which has the exprplan
+ * @return - The PlansAndFlattens struct which has the exprplan
* for 'generate field[0] field[1]' set.
* @throws ExecException
* @throws PlanException
*/
- public static POGenerate topGenerateOpWithExPlanForFe(int[] fields, Tuple sample) throws ExecException, PlanException {
+ public static PlansAndFlattens topGenerateOpWithExPlanForFe(
+ int[] fields,
+ Tuple sample) throws ExecException, PlanException {
POProject[] prj = new POProject[fields.length];
for(int i=0;i<prj.length;i++){
@@ -339,10 +343,10 @@
- List<ExprPlan> inputs = new LinkedList<ExprPlan>();
- ExprPlan[] plans = new ExprPlan[fields.length];
+ List<PhysicalPlan> inputs = new LinkedList<PhysicalPlan>();
+ PhysicalPlan[] plans = new PhysicalPlan[fields.length];
for (int i=0;i<plans.length;i++) {
- plans[i] = new ExprPlan();
+ plans[i] = new PhysicalPlan();
plans[i].add(prj[i]);
cst[i] = new POCastDummy(new OperatorKey("",r.nextLong()));
cst[i].setResultType(sample.getType(fields[i]));
@@ -351,25 +355,26 @@
inputs.add(plans[i]);
}
- POGenerate ret = new POGenerate(new OperatorKey("", r.nextLong()),
- inputs, toBeFlattened);
- return ret;
+ return new PlansAndFlattens(inputs, toBeFlattened);
}
/**
- * creates the POGenerate operator for
+ * creates the PlansAndFlattens struct for
* 'generate field[0] field[1] ...'.
* with the flatten list as specified
* @param field - The columns to be generated
* @param toBeFlattened - The columns to be flattened
* @param sample - The sample tuple that is used to infer
* result type
- * @return - The POGenerate operator which has the exprplan
+ * @return - The PlansAndFlattens struct which has the exprplan
* for 'generate field[0] field[1]' set.
* @throws ExecException
* @throws PlanException
*/
- public static POGenerate topGenerateOpWithExPlanForFe(int[] fields, Tuple sample, List<Boolean> toBeFlattened) throws ExecException, PlanException {
+ public static PlansAndFlattens topGenerateOpWithExPlanForFe(
+ int[] fields,
+ Tuple sample,
+ List<Boolean> toBeFlattened) throws ExecException, PlanException {
POProject[] prj = new POProject[fields.length];
for(int i=0;i<prj.length;i++){
@@ -381,14 +386,10 @@
POCastDummy[] cst = new POCastDummy[fields.length];
- /*List<Boolean> toBeFlattened = new LinkedList<Boolean>();
- for (POProject project : prj)
- toBeFlattened.add(false);*/
-
- List<ExprPlan> inputs = new LinkedList<ExprPlan>();
- ExprPlan[] plans = new ExprPlan[fields.length];
+ List<PhysicalPlan> inputs = new LinkedList<PhysicalPlan>();
+ PhysicalPlan[] plans = new PhysicalPlan[fields.length];
for (int i=0;i<plans.length;i++) {
- plans[i] = new ExprPlan();
+ plans[i] = new PhysicalPlan();
plans[i].add(prj[i]);
cst[i] = new POCastDummy(new OperatorKey("",r.nextLong()));
cst[i].setResultType(sample.getType(fields[i]));
@@ -397,9 +398,7 @@
inputs.add(plans[i]);
}
- POGenerate ret = new POGenerate(new OperatorKey("", r.nextLong()),
- inputs, toBeFlattened);
- return ret;
+ return new PlansAndFlattens(inputs, toBeFlattened);
}
/**
@@ -413,8 +412,8 @@
*/
public static POLocalRearrange topLocalRearrangeOPWithPlan(int index, int grpCol, Tuple sample) throws ExecException, PlanException{
POLocalRearrange lr = topLocalRearrangeOPWithPlanPlain(index, grpCol, sample);
- List<ExprPlan> plans = lr.getPlans();
- ExprPlan ep = plans.get(0);
+ List<PhysicalPlan> plans = lr.getPlans();
+ PhysicalPlan ep = plans.get(0);
POCastDummy cst = new POCastDummy(new OperatorKey("", r.nextLong()));
cst.setResultType(sample.getType(grpCol));
ep.addAsLeaf(cst);
@@ -436,10 +435,10 @@
prj1.setResultType(sample.getType(grpCol));
prj1.setOverloaded(false);
- ExprPlan plan1 = new ExprPlan();
+ PhysicalPlan plan1 = new PhysicalPlan();
plan1.add(prj1);
- List<ExprPlan> plans = new ArrayList<ExprPlan>();
+ List<PhysicalPlan> plans = new ArrayList<PhysicalPlan>();
plans.add(plan1);
POLocalRearrange ret = topLocalRearrangeOp();
ret.setPlans(plans);
@@ -458,12 +457,11 @@
* @throws ExecException
*/
public static POForEach topForEachOPWithPlan(int field, Tuple sample) throws ExecException, PlanException{
- POGenerate gen = topGenerateOpWithExPlanForFe(field, sample);
- PhysicalPlan<PhysicalOperator> pp = new PhysicalPlan<PhysicalOperator>();
- pp.add(gen);
+ PlansAndFlattens pf = topGenerateOpWithExPlanForFe(field, sample);
POForEach ret = topForEachOp();
- ret.setPlan(pp);
+ ret.setInputPlans(pf.plans);
+ ret.setToBeFlattened(pf.flattens);
ret.setResultType(DataType.TUPLE);
return ret;
}
@@ -477,12 +475,11 @@
* @throws ExecException
*/
public static POForEach topForEachOPWithPlan(int[] fields, Tuple sample) throws ExecException, PlanException{
- POGenerate gen = topGenerateOpWithExPlanForFe(fields, sample);
- PhysicalPlan<PhysicalOperator> pp = new PhysicalPlan<PhysicalOperator>();
- pp.add(gen);
+ PlansAndFlattens pf = topGenerateOpWithExPlanForFe(fields, sample);
POForEach ret = topForEachOp();
- ret.setPlan(pp);
+ ret.setInputPlans(pf.plans);
+ ret.setToBeFlattened(pf.flattens);
ret.setResultType(DataType.TUPLE);
return ret;
}
@@ -495,13 +492,16 @@
* @return - The POForEach operator
* @throws ExecException
*/
- public static POForEach topForEachOPWithPlan(int[] fields, Tuple sample, List<Boolean> toBeFlattened) throws ExecException, PlanException{
- POGenerate gen = topGenerateOpWithExPlanForFe(fields, sample, toBeFlattened);
- PhysicalPlan<PhysicalOperator> pp = new PhysicalPlan<PhysicalOperator>();
- pp.add(gen);
+ public static POForEach topForEachOPWithPlan(
+ int[] fields,
+ Tuple sample,
+ List<Boolean> toBeFlattened) throws ExecException, PlanException{
+ PlansAndFlattens pf =
+ topGenerateOpWithExPlanForFe(fields, sample, toBeFlattened);
POForEach ret = topForEachOp();
- ret.setPlan(pp);
+ ret.setInputPlans(pf.plans);
+ ret.setToBeFlattened(toBeFlattened);
ret.setResultType(DataType.TUPLE);
return ret;
}
@@ -515,12 +515,11 @@
* @throws ExecException
*/
public static POForEach topForEachOPWithPlan(int field) throws ExecException, PlanException{
- POGenerate gen = topGenerateOpWithExPlanForFeFlat(field);
- PhysicalPlan<PhysicalOperator> pp = new PhysicalPlan<PhysicalOperator>();
- pp.add(gen);
+ PlansAndFlattens pf = topGenerateOpWithExPlanForFeFlat(field);
POForEach ret = topForEachOp();
- ret.setPlan(pp);
+ ret.setInputPlans(pf.plans);
+ ret.setToBeFlattened(pf.flattens);
ret.setResultType(DataType.TUPLE);
return ret;
}
@@ -552,7 +551,7 @@
gr.setRhs(ce2);
gr.setOperandType(DataType.INTEGER);
- ExprPlan ep = new ExprPlan();
+ PhysicalPlan ep = new PhysicalPlan();
ep.add(ce1);
ep.add(ce2);
ep.add(gr);
@@ -582,7 +581,7 @@
gr.setRhs(ce2);
gr.setOperandType(DataType.INTEGER);
- ExprPlan ep = new ExprPlan();
+ PhysicalPlan ep = new PhysicalPlan();
ep.add(proj);
ep.add(ce2);
ep.add(gr);
@@ -627,7 +626,7 @@
cop.setRhs(ce2);
cop.setOperandType(DataType.INTEGER);
- ExprPlan ep = new ExprPlan();
+ PhysicalPlan ep = new PhysicalPlan();
ep.add(proj);
ep.add(ce2);
ep.add(cop);
@@ -674,7 +673,7 @@
cop.setRhs(ce2);
cop.setOperandType(DataType.INTEGER);
- ExprPlan ep = new ExprPlan();
+ PhysicalPlan ep = new PhysicalPlan();
ep.add(cst);
ep.add(proj);
ep.add(ce2);
@@ -714,8 +713,8 @@
return ret;
}
- public static PhysicalPlan<PhysicalOperator> grpChain() throws ExecException, PlanException{
- PhysicalPlan<PhysicalOperator> grpChain = new PhysicalPlan<PhysicalOperator>();
+ public static PhysicalPlan grpChain() throws ExecException, PlanException{
+ PhysicalPlan grpChain = new PhysicalPlan();
POLocalRearrange lr = GenPhyOp.topLocalRearrangeOp();
POGlobalRearrange gr = GenPhyOp.topGlobalRearrangeOp();
POPackage pk = GenPhyOp.topPackageOp();
@@ -730,8 +729,8 @@
return grpChain;
}
- public static PhysicalPlan<PhysicalOperator> loadedGrpChain() throws ExecException, PlanException{
- PhysicalPlan<PhysicalOperator> ret = new PhysicalPlan<PhysicalOperator>();
+ public static PhysicalPlan loadedGrpChain() throws ExecException, PlanException{
+ PhysicalPlan ret = new PhysicalPlan();
POLoad ld = GenPhyOp.topLoadOp();
POLocalRearrange lr = GenPhyOp.topLocalRearrangeOp();
POGlobalRearrange gr = GenPhyOp.topGlobalRearrangeOp();
@@ -749,8 +748,8 @@
return ret;
}
- public static PhysicalPlan<PhysicalOperator> loadedFilter() throws ExecException, PlanException{
- PhysicalPlan<PhysicalOperator> ret = new PhysicalPlan<PhysicalOperator>();
+ public static PhysicalPlan loadedFilter() throws ExecException, PlanException{
+ PhysicalPlan ret = new PhysicalPlan();
POLoad ld = GenPhyOp.topLoadOp();
POFilter fl = GenPhyOp.topFilterOp();
ret.add(ld);
@@ -761,10 +760,10 @@
}
public static POForEach topForEachOPWithUDF(List<String> clsName) throws PlanException{
- List<ExprPlan> ep4s = new ArrayList<ExprPlan>();
+ List<PhysicalPlan> ep4s = new ArrayList<PhysicalPlan>();
List<Boolean> flattened3 = new ArrayList<Boolean>();
for (String string : clsName) {
- ExprPlan ep4 = new ExprPlan();
+ PhysicalPlan ep4 = new PhysicalPlan();
POProject prjStar4 = new POProject(new OperatorKey("", r.nextLong()));
prjStar4.setResultType(DataType.TUPLE);
prjStar4.setStar(true);
@@ -779,19 +778,14 @@
flattened3.add(false);
}
- POGenerate finGen = new POGenerate(new OperatorKey("", r.nextLong()), ep4s, flattened3);
-
- PhysicalPlan<PhysicalOperator> fe3Plan = new PhysicalPlan<PhysicalOperator>();
- fe3Plan.add(finGen);
-
- POForEach fe3 = new POForEach(new OperatorKey("", r.nextLong()));
- fe3.setPlan(fe3Plan);
+ POForEach fe3 = new POForEach(new OperatorKey("", r.nextLong()), 1,
+ ep4s, flattened3);
fe3.setResultType(DataType.TUPLE);
return fe3;
}
- public static ExprPlan arithPlan() throws PlanException{
- ExprPlan ep = new ExprPlan();
+ public static PhysicalPlan arithPlan() throws PlanException{
+ PhysicalPlan ep = new PhysicalPlan();
ConstantExpression ce[] = new ConstantExpression[7];
for(int i=0;i<ce.length;i++){
ce[i] = GenPhyOp.exprConst();
Modified: incubator/pig/branches/types/test/org/apache/pig/test/utils/POCastDummy.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/utils/POCastDummy.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/utils/POCastDummy.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/utils/POCastDummy.java Thu Jun 26 13:05:23 2008
@@ -22,7 +22,7 @@
import org.apache.pig.impl.plan.OperatorKey;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
-import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
+import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.impl.physicalLayer.expressionOperators.ExpressionOperator;
import org.apache.pig.impl.plan.VisitorException;
@@ -49,7 +49,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws VisitorException {
+ public void visit(PhyPlanVisitor v) throws VisitorException {
// TODO Auto-generated method stub
}
Modified: incubator/pig/branches/types/test/org/apache/pig/test/utils/dotGraph/DotGraphVisitor.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/utils/dotGraph/DotGraphVisitor.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/utils/dotGraph/DotGraphVisitor.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/utils/dotGraph/DotGraphVisitor.java Thu Jun 26 13:05:23 2008
@@ -120,9 +120,9 @@
* the logical generate operator that has to be visited
* @throws VisitorException
*/
- protected void visit(LOGenerate g) throws VisitorException {
+ protected void visit(LOForEach g) throws VisitorException {
// Visit each of generates projection elements.
- for(LogicalPlan lp: g.getGeneratePlans()) {
+ for(LogicalPlan lp: g.getForEachPlans()) {
PlanWalker w = new DependencyOrderWalker(lp);
pushWalker(w);
for(LogicalOperator logicalOp: lp.getRoots()) {
@@ -185,6 +185,7 @@
* the logical foreach operator that has to be visited
* @throws VisitorException
*/
+ /*
protected void visit(LOForEach forEach) throws VisitorException {
// Visit the operators that are part of the foreach plan
LogicalPlan plan = forEach.getForEachPlan();
@@ -195,6 +196,7 @@
}
popWalker();
}
+ */
/**
* Iterate over each expression that is part of the function argument list
Modified: incubator/pig/branches/types/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java?rev=672016&r1=672015&r2=672016&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java (original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java Thu Jun 26 13:05:23 2008
@@ -119,7 +119,7 @@
}
private LOForEach createLOForEach(DotNode node, LogicalPlan plan) {
- LOForEach foreach = new LOForEach(plan, getKey(node.attributes), null) ;
+ LOForEach foreach = new LOForEach(plan, getKey(node.attributes), null, null) ;
fillSchema(foreach, node.attributes) ;
return foreach ;
}