Author: gates
Date: Wed Jul 9 10:58:42 2008
New Revision: 675273
URL: http://svn.apache.org/viewvc?rev=675273&view=rev
Log:
PIG-285 Shravan's sortfin patch. This addresses some, though not all, order by
issues.
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogToPhyTranslationVisitor.java
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/JobControlCompiler.java
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/MRCompiler.java
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/plans/UDFFinder.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserComparisonFunc.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserFunc.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POSort.java
incubator/pig/branches/types/test/org/apache/pig/test/TestMRCompiler.java
incubator/pig/branches/types/test/org/apache/pig/test/TestPOSort.java
incubator/pig/branches/types/test/org/apache/pig/test/TestPOUserFunc.java
incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld
incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld
incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Sort.gld
incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split1.gld
incubator/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Split2.gld
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogToPhyTranslationVisitor.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogToPhyTranslationVisitor.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogToPhyTranslationVisitor.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogToPhyTranslationVisitor.java
Wed Jul 9 10:58:42 2008
@@ -687,7 +687,7 @@
.getNextNodeId(scope)), s.getRequestedParallelism(), null,
sortPlans, s.getAscendingCols(), null);
} else {
- POUserFunc comparator = new POUserComparisonFunc(new OperatorKey(
+ POUserComparisonFunc comparator = new POUserComparisonFunc(new
OperatorKey(
scope, nodeGen.getNextNodeId(scope)), s
.getRequestedParallelism(), null, s.getUserFunc());
sort = new POSort(new OperatorKey(scope, nodeGen
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/JobControlCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/JobControlCompiler.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/JobControlCompiler.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/JobControlCompiler.java
Wed Jul 9 10:58:42 2008
@@ -32,6 +32,7 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.jobcontrol.Job;
import org.apache.hadoop.mapred.jobcontrol.JobControl;
+import org.apache.pig.ComparisonFunc;
import org.apache.pig.data.DataType;
import org.apache.pig.data.IndexedTuple;
import org.apache.pig.data.TupleFactory;
@@ -265,6 +266,12 @@
if(mro.isGlobalSort()){
jobConf.set("pig.quantilesFile", mro.getQuantFile());
jobConf.setPartitionerClass(SortPartitioner.class);
+ if(mro.UDFs.size()==1){
+ String compFuncSpec = mro.UDFs.get(0);
+ Class comparator = Class.forName(compFuncSpec);
+ if(ComparisonFunc.class.isAssignableFrom(comparator))
+ jobConf.setOutputKeyComparatorClass(comparator);
+ }
}
return jobConf;
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/MRCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/MRCompiler.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/MRCompiler.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/MRCompiler.java
Wed Jul 9 10:58:42 2008
@@ -726,6 +726,9 @@
int[] fields = getSortCols(op);
MapReduceOper quant = getQuantileJob(op, mro, fSpec, quantFile,
rp, fields);
curMROp = getSortJob(quant, fSpec, quantFile, rp, fields);
+ if(op.isUDFComparatorUsed){
+ curMROp.UDFs.add(op.getMSortFunc().getFuncSpec());
+ }
}catch(Exception e){
VisitorException pe = new VisitorException(e.getMessage());
pe.initCause(e);
@@ -875,16 +878,16 @@
nesSortPlanLst.add(nesSortPlan);
sort.setSortPlans(nesSortPlanLst);
- sort.setResultType(DataType.TUPLE);
+ sort.setResultType(DataType.BAG);
fe2Plan.add(sort);
fe2Plan.connect(topPrj, sort);
- PhysicalPlan ep3 = new PhysicalPlan();
+ /*PhysicalPlan ep3 = new PhysicalPlan();
POProject prjStar3 = new POProject(new
OperatorKey(scope,nig.getNextNodeId(scope)));
prjStar3.setResultType(DataType.BAG);
prjStar3.setColumn(1);
prjStar3.setStar(false);
- ep3.add(prjStar3);
+ ep3.add(prjStar3);*/
PhysicalPlan rpep = new PhysicalPlan();
ConstantExpression rpce = new ConstantExpression(new
OperatorKey(scope,nig.getNextNodeId(scope)));
@@ -895,7 +898,7 @@
List<PhysicalPlan> genEps = new ArrayList<PhysicalPlan>();
genEps.add(rpep);
- genEps.add(ep3);
+ genEps.add(fe2Plan);
List<Boolean> flattened2 = new ArrayList<Boolean>();
flattened2.add(false);
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/plans/UDFFinder.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/plans/UDFFinder.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/plans/UDFFinder.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/mapReduceLayer/plans/UDFFinder.java
Wed Jul 9 10:58:42 2008
@@ -4,6 +4,7 @@
import java.util.List;
import org.apache.pig.impl.physicalLayer.PhysicalOperator;
+import
org.apache.pig.impl.physicalLayer.expressionOperators.POUserComparisonFunc;
import org.apache.pig.impl.physicalLayer.expressionOperators.POUserFunc;
import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.impl.physicalLayer.plans.PhysicalPlan;
@@ -67,4 +68,11 @@
public void visitUserFunc(POUserFunc userFunc) throws VisitorException {
UDFs.add(userFunc.getFuncSpec());
}
+
+ @Override
+ public void visitComparisonFunc(POUserComparisonFunc compFunc) throws
VisitorException {
+ UDFs.add(compFunc.getFuncSpec());
+ }
+
+
}
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserComparisonFunc.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserComparisonFunc.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserComparisonFunc.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserComparisonFunc.java
Wed Jul 9 10:58:42 2008
@@ -11,24 +11,30 @@
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.data.DataBag;
import org.apache.pig.data.DataByteArray;
+import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.plan.OperatorKey;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
+import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
-public class POUserComparisonFunc extends POUserFunc {
+public class POUserComparisonFunc extends ExpressionOperator {
/**
*
*/
private static final long serialVersionUID = 1L;
+ String funcSpec;
+ Tuple t1, t2;
transient ComparisonFunc func;
private Log log = LogFactory.getLog(getClass());
public POUserComparisonFunc(OperatorKey k, int rp, List inp, String
funcSpec, ComparisonFunc func) {
- super(k, rp, inp);
- this.funcSpec = funcSpec;
+ super(k, rp);
+ super.setInputs(inp);
+ this.funcSpec = funcSpec;
this.func = func;
if(func==null)
instantiateFunc();
@@ -124,4 +130,23 @@
instantiateFunc();
}
+ @Override
+ public void visit(PhyPlanVisitor v) throws VisitorException {
+ v.visitComparisonFunc(this);
+ }
+
+ @Override
+ public String name() {
+ return "POUserComparisonFunc" + "(" + func.getClass().getName() + ")"
+ "[" + DataType.findTypeName(resultType) + "]" + " - " + mKey.toString();
+ }
+
+ @Override
+ public boolean supportsMultipleInputs() {
+ return false;
+ }
+
+ public String getFuncSpec() {
+ return funcSpec;
+ }
+
}
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserFunc.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserFunc.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserFunc.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/expressionOperators/POUserFunc.java
Wed Jul 9 10:58:42 2008
@@ -50,7 +50,7 @@
*/
private static final long serialVersionUID = 1L;
transient EvalFunc func;
- Tuple t1, t2;
+
private final Log log = LogFactory.getLog(getClass());
String funcSpec;
String origFSpec;
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java
Wed Jul 9 10:58:42 2008
@@ -40,6 +40,7 @@
import org.apache.pig.impl.physicalLayer.expressionOperators.POOr;
import org.apache.pig.impl.physicalLayer.expressionOperators.POProject;
import org.apache.pig.impl.physicalLayer.expressionOperators.PORegexp;
+import
org.apache.pig.impl.physicalLayer.expressionOperators.POUserComparisonFunc;
import org.apache.pig.impl.physicalLayer.expressionOperators.POUserFunc;
import org.apache.pig.impl.physicalLayer.expressionOperators.Subtract;
import org.apache.pig.impl.physicalLayer.relationalOperators.POForEach;
@@ -220,6 +221,10 @@
public void visitUserFunc(POUserFunc userFunc) throws VisitorException {
//do nothing
}
+
+ public void visitComparisonFunc(POUserComparisonFunc compFunc) throws
VisitorException {
+ //do nothing
+ }
public void visitMapLookUp(POMapLookUp mapLookUp) {
// TODO Auto-generated method stub
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POSort.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POSort.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POSort.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POSort.java
Wed Jul 9 10:58:42 2008
@@ -73,12 +73,12 @@
transient Iterator<Tuple> it;
public POSort(OperatorKey k, int rp, List inp, List<PhysicalPlan>
sortPlans,
- List<Boolean> mAscCols, POUserFunc mSortFunc) {
+ List<Boolean> mAscCols, POUserComparisonFunc mSortFunc)
{
super(k, rp, inp);
//this.mSortCols = mSortCols;
this.sortPlans = sortPlans;
this.mAscCols = mAscCols;
- this.mSortFunc = (POUserComparisonFunc) mSortFunc;
+ this.mSortFunc = mSortFunc;
if (mSortFunc == null) {
sortedBag = BagFactory.getInstance().newSortedBag(
new SortComparator());
@@ -206,7 +206,7 @@
@Override
public String name() {
- return "POSort" + "[" + DataType.findTypeName(resultType) + "]"
+" - " + mKey.toString();
+ return "POSort" + "[" + DataType.findTypeName(resultType) + "]"
+ "(" + (mSortFunc!=null?mSortFunc.getFuncSpec():"") + ")" +" - " +
mKey.toString();
}
@Override
Modified:
incubator/pig/branches/types/test/org/apache/pig/test/TestMRCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestMRCompiler.java?rev=675273&r1=675272&r2=675273&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestMRCompiler.java
(original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestMRCompiler.java
Wed Jul 9 10:58:42 2008
@@ -718,7 +718,7 @@
php.merge(ldFil1);
String funcName = WeirdComparator.class.getName();
- POUserFunc comparator = new POUserComparisonFunc(
+ POUserComparisonFunc comparator = new POUserComparisonFunc(
new OperatorKey("", r.nextLong()), -1, null, funcName);
POSort sort = new POSort(new OperatorKey("", r.nextLong()), -1,
ldFil1.getLeaves(),
null, null, comparator);
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=675273&r1=675272&r2=675273&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 Wed
Jul 9 10:58:42 2008
@@ -183,7 +183,7 @@
String funcName = WeirdComparator.class.getName() + "()";
/*POUserFunc comparator = new POUserFunc(
new OperatorKey("", r.nextLong()), -1, inputs,
funcName);*/
- POUserFunc comparator = new POUserComparisonFunc(
+ POUserComparisonFunc comparator = new POUserComparisonFunc(
new OperatorKey("", r.nextLong()), -1, null,
funcName);
POSort sort = new POSort(new OperatorKey("", r.nextLong()), -1,
inputs,
null, null, comparator);
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=675273&r1=675272&r2=675273&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
Wed Jul 9 10:58:42 2008
@@ -248,14 +248,14 @@
DataBag input = (DataBag)
GenRandomData.genRandSmallTupDataBag(r, 2,
100);
String funcSpec = WeirdComparator.class.getName() + "()";
- POUserFunc userFunc = new POUserComparisonFunc(new
OperatorKey("", r.nextLong()),
+ POUserComparisonFunc userFunc = new POUserComparisonFunc(new
OperatorKey("", r.nextLong()),
-1, null, funcSpec);
Iterator<Tuple> it = input.iterator();
Tuple t1 = it.next();
Tuple t2 = it.next();
t1.append(2);
t2.append(3);
- ((POUserComparisonFunc)userFunc).attachInput(t1, t2);
+ userFunc.attachInput(t1, t2);
Integer i = null;
// System.out.println(t1 + " " + t2);
int result = (Integer) (userFunc.getNext(i).result);
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=675273&r1=675272&r2=675273&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
Wed Jul 9 10:58:42 2008
@@ -1,20 +1,20 @@
Filter[tuple] - Test-Plan-Builder-214
| |
-| Not[boolean] - Test-Plan-Builder-217
+| POIsNull[tuple] - Test-Plan-Builder-216
| |
-| |---POIsNull[tuple] - Test-Plan-Builder-216
-| |
-| |---Project[bytearray][0] - Test-Plan-Builder-215
+| |---Project[bytearray][0] - Test-Plan-Builder-215
|
|---Split - Test-Plan-Builder-213
|
|---Load(a:org.apache.pig.builtin.PigStorage()) - Test-Plan-Builder-212
-Filter[tuple] - Test-Plan-Builder-218
+Filter[tuple] - Test-Plan-Builder-217
| |
-| POIsNull[tuple] - Test-Plan-Builder-220
+| Not[boolean] - Test-Plan-Builder-220
| |
-| |---Project[bytearray][0] - Test-Plan-Builder-219
+| |---POIsNull[tuple] - Test-Plan-Builder-219
+| |
+| |---Project[bytearray][0] - Test-Plan-Builder-218
|
|---Split - Test-Plan-Builder-213
|
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=675273&r1=675272&r2=675273&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
Wed Jul 9 10:58:42 2008
@@ -4,7 +4,7 @@
| |
| |---POIsNull[tuple] - Test-Plan-Builder-216
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-215
+| |---Project[bytearray][0] - Test-Plan-Builder-215
|
|---Split - Test-Plan-Builder-213
|
@@ -14,7 +14,7 @@
| |
| POIsNull[tuple] - Test-Plan-Builder-220
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-219
+| |---Project[bytearray][0] - Test-Plan-Builder-219
|
|---Split - Test-Plan-Builder-213
|
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=675273&r1=675272&r2=675273&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
Wed Jul 9 10:58:42 2008
@@ -1,4 +1,4 @@
-MapReduce(1,GFCross) - -166:
+MapReduce(1,GFCross) - -165:
| Store(DummyFil:DummyLdr) - -6139496040975471496
| |
| |---New For Each(false)[tuple] - -5878058249424113280
@@ -8,10 +8,10 @@
| | |---Project[tuple][*] - -7856319821130535798
| |
| |---Package[tuple]{Unknown} - -7398260302074824818
-| Load(/tmp/temp-1456742965/tmp-586682361:org.apache.pig.builtin.BinStorage)
- -165
+| Load(/tmp/temp-1456742965/tmp-586682361:org.apache.pig.builtin.BinStorage)
- -164
|
-|---MapReduce(1,AVG) - -163:
- |
Store(/tmp/temp-1456742965/tmp-586682361:org.apache.pig.builtin.BinStorage) -
-164
+|---MapReduce(1,AVG) - -162:
+ |
Store(/tmp/temp-1456742965/tmp-586682361:org.apache.pig.builtin.BinStorage) -
-163
| |
| |---Local Rearrange[tuple]{Unknown} - -7973970339130605847
| |
@@ -22,10 +22,10 @@
| | |---Project[tuple][*] - -737965411848544085
| |
| |---Package[tuple]{Unknown} - --3148893660811981376
- |
Load(/tmp/temp-1456742965/tmp-26634357:org.apache.pig.builtin.BinStorage) - -162
+ |
Load(/tmp/temp-1456742965/tmp-26634357:org.apache.pig.builtin.BinStorage) - -161
|
- |---MapReduce(20,FindQuantiles,SUM) - -155:
- |
Store(/tmp/temp-1456742965/tmp-26634357:org.apache.pig.builtin.BinStorage) -
-161
+ |---MapReduce(20,TestMRCompiler$WeirdComparator,FindQuantiles,SUM) - -154:
+ |
Store(/tmp/temp-1456742965/tmp-26634357:org.apache.pig.builtin.BinStorage) -
-160
| |
| |---Local Rearrange[tuple]{Unknown} - --7926255547935388282
| |
@@ -39,31 +39,35 @@
| | |
| | |---Project[tuple][*] - --8002381389674382470
| |
- | |---New For Each(true)[tuple] - -160
+ | |---New For Each(true)[tuple] - -159
| | |
- | | Project[bag][1] - -159
+ | | Project[bag][1] - -158
| |
- | |---Package[tuple]{bytearray} - -158
- | Local Rearrange[tuple]{bytearray} - -157
+ | |---Package[tuple]{bytearray} - -157
+ | Local Rearrange[tuple]{bytearray} - -156
| | |
- | | Project[bytearray][0] - -156
+ | | Project[bytearray][0] - -155
| |
- |
|---Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage)
- -154
+ |
|---Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage)
- -153
|
|---MapReduce(-1,FindQuantiles,TestMRCompiler$WeirdComparator) - -139:
- |
Store(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) -
-153
+ |
Store(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) -
-152
| |
- | |---New For Each(false)[tuple] - -152
+ | |---New For Each(false)[tuple] - -151
| | |
- | |
POUserFunc(org.apache.pig.impl.builtin.FindQuantiles)[tuple] - -151
+ | |
POUserFunc(org.apache.pig.impl.builtin.FindQuantiles)[tuple] - -150
| | |
- | | |---Project[tuple][*] - -150
+ | | |---Project[tuple][*] - -149
| |
- | |---New For Each(false,false)[tuple] - -149
+ | |---New For Each(false,false)[tuple] - -148
| | |
- | | Constant(20) - -148
+ | | Constant(20) - -147
| | |
- | | Project[bag][1] - -147
+ | |
POSort[bag](org.apache.pig.test.TestMRCompiler$WeirdComparator) -
--776319888013965510
+ | | | |
+ | | | Project[tuple][*] - -146
+ | | |
+ | | |---Project[tuple][1] - -145
| |
| |---Package[tuple]{chararray} - -144
| Local Rearrange[tuple]{chararray} - -143
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=675273&r1=675272&r2=675273&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
Wed Jul 9 10:58:42 2008
@@ -1,36 +1,36 @@
-MapReduce(-1) - -180:
+MapReduce(-1) - -179:
| Store(DummyFil:DummyLdr) - --2783416442434419494
| |
-| |---New For Each(false)[bag] - -183
+| |---New For Each(false)[bag] - -182
| | |
-| | Project[tuple][0] - -182
+| | Project[tuple][0] - -181
| |
-| |---Package[tuple]{tuple} - -181
-| Load(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage)
- -179
+| |---Package[tuple]{tuple} - -180
+| Load(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage)
- -178
|
-|---MapReduce(-1) - -175:
- |
Store(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) -
-178
+|---MapReduce(-1) - -174:
+ |
Store(/tmp/temp-1456742965/tmp2077335416:org.apache.pig.builtin.BinStorage) -
-177
| |
- | |---Local Rearrange[tuple]{tuple} - -177
+ | |---Local Rearrange[tuple]{tuple} - -176
| | |
- | | Project[tuple][*] - -176
+ | | Project[tuple][*] - -175
| |
| |---Package[tuple]{Unknown} - -7714111612268358662
- |
Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) -
-174
+ |
Load(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) -
-173
|
- |---MapReduce(-1) - -167:
- |
Store(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) -
-173
+ |---MapReduce(-1) - -166:
+ |
Store(/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.builtin.BinStorage) -
-172
| |
| |---Local Rearrange[tuple]{Unknown} - -5321755951016030071
| |
- | |---New For Each(false)[bag] - -172
+ | |---New For Each(false)[bag] - -171
| | |
- | | Project[tuple][0] - -171
+ | | Project[tuple][0] - -170
| |
- | |---Package[tuple]{tuple} - -170
- | Local Rearrange[tuple]{tuple} - -169
+ | |---Package[tuple]{tuple} - -169
+ | Local Rearrange[tuple]{tuple} - -168
| | |
- | | Project[tuple][*] - -168
+ | | Project[tuple][*] - -167
| |
| |---Filter[tuple] - -2197807331204639125
| |
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=675273&r1=675272&r2=675273&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
Wed Jul 9 10:58:42 2008
@@ -1,4 +1,4 @@
-POSort[bag] - Test-Plan-Builder-22
+POSort[bag]() - Test-Plan-Builder-22
| |
| Project[bytearray][0] - Test-Plan-Builder-21
|
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=675273&r1=675272&r2=675273&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
Wed Jul 9 10:58:42 2008
@@ -1,6 +1,6 @@
Filter[tuple] - Test-Plan-Builder-196
| |
-| Greater Than[boolean] - Test-Plan-Builder-199
+| Less Than[boolean] - Test-Plan-Builder-199
| |
| |---Project[bytearray][0] - Test-Plan-Builder-197
| |
@@ -12,7 +12,7 @@
Filter[tuple] - Test-Plan-Builder-200
| |
-| Less Than[boolean] - Test-Plan-Builder-203
+| Greater Than[boolean] - Test-Plan-Builder-203
| |
| |---Project[bytearray][0] - Test-Plan-Builder-201
| |
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=675273&r1=675272&r2=675273&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
Wed Jul 9 10:58:42 2008
@@ -2,7 +2,7 @@
| |
| Greater Than[boolean] - Test-Plan-Builder-199
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-197
+| |---Project[bytearray][0] - Test-Plan-Builder-197
| |
| |---Constant(7) - Test-Plan-Builder-198
|
@@ -14,7 +14,7 @@
| |
| Less Than[boolean] - Test-Plan-Builder-203
| |
-| |---Project[bytearray](0) - Test-Plan-Builder-201
+| |---Project[bytearray][0] - Test-Plan-Builder-201
| |
| |---Constant(7) - Test-Plan-Builder-202
|
