You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ju...@apache.org on 2013/05/18 03:10:20 UTC
svn commit: r1484037 [3/6] - in /pig/trunk: ./
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expression...
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java Sat May 18 01:10:18 2013
@@ -180,7 +180,7 @@ public class PODemux extends PhysicalOpe
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
if (!inCombiner && this.parentPlan.endOfAllInput) {
@@ -217,7 +217,7 @@ public class PODemux extends PhysicalOpe
while (true) {
- res = leaf.getNext(dummyTuple);
+ res = leaf.getNextTuple();
if (res.returnStatus == POStatus.STATUS_OK ||
res.returnStatus == POStatus.STATUS_EOP ||
@@ -272,7 +272,7 @@ public class PODemux extends PhysicalOpe
}
} else {
curLeaf = leaf;
- res = leaf.getNext(dummyTuple);
+ res = leaf.getNextTuple();
if (res.returnStatus == POStatus.STATUS_EOP) {
processedSet.set(idx++);
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java Sat May 18 01:10:18 2013
@@ -82,7 +82,7 @@ public class PODistinct extends Physical
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
if (!inputsAccumulated) {
Result in = processInput();
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java Sat May 18 01:10:18 2013
@@ -224,7 +224,7 @@ public class POFRJoin extends PhysicalOp
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result res = null;
Result inp = null;
if (!setUp) {
@@ -236,7 +236,7 @@ public class POFRJoin extends PhysicalOp
// Assumes that it is configured appropriately with
// the bags for the current key.
while (true) {
- res = fe.getNext(dummyTuple);
+ res = fe.getNextTuple();
if (res.returnStatus == POStatus.STATUS_OK) {
return res;
@@ -268,7 +268,7 @@ public class POFRJoin extends PhysicalOp
// Separate Key & Value using the fragment's LR operator
POLocalRearrange lr = LRs[fragment];
lr.attachInput((Tuple) inp.result);
- Result lrOut = lr.getNext(dummyTuple);
+ Result lrOut = lr.getNextTuple();
if (lrOut.returnStatus != POStatus.STATUS_OK) {
log.error("LocalRearrange isn't configured right or is not working");
return new Result();
@@ -312,7 +312,7 @@ public class POFRJoin extends PhysicalOp
// constant Expressions
// All subsequent calls ( by parent ) to this function will return
// next tuple of crossproduct
- Result gn = getNext(dummyTuple);
+ Result gn = getNextTuple();
return gn;
}
@@ -395,7 +395,7 @@ public class POFRJoin extends PhysicalOp
TupleToMapKey replicate = new TupleToMapKey(1000, keySchemaTupleFactory);
log.debug("Completed setup. Trying to build replication hash table");
- for (Result res = lr.getNext(dummyTuple);res.returnStatus != POStatus.STATUS_EOP;res = lr.getNext(dummyTuple)) {
+ for (Result res = lr.getNextTuple(); res.returnStatus != POStatus.STATUS_EOP; res = lr.getNextTuple()) {
if (getReporter() != null)
getReporter().progress();
Tuple tuple = (Tuple) res.result;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java Sat May 18 01:10:18 2013
@@ -88,7 +88,7 @@ public class POFilter extends PhysicalOp
* can be passed through is found or EOP is reached.
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result res = null;
Result inp = null;
while (true) {
@@ -145,7 +145,7 @@ public class POFilter extends PhysicalOp
DataType.findTypeName(compOperandType));
}
*/
- res = comOp.getNext(dummyBool);
+ res = comOp.getNextBoolean();
plan.detachInput();
if (res.returnStatus != POStatus.STATUS_OK
&& res.returnStatus != POStatus.STATUS_NULL)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java Sat May 18 01:10:18 2013
@@ -205,7 +205,7 @@ public class POForEach extends PhysicalO
* to denote the begin and end of the nested plan processing.
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
try {
Result res = null;
Result inp = null;
@@ -375,7 +375,7 @@ public class POForEach extends PhysicalO
case DataType.BIGDECIMAL :
case DataType.DATETIME :
case DataType.CHARARRAY :
- inputData = planLeafOps[i].getNext(getDummy(resultTypes[i]), resultTypes[i]);
+ inputData = planLeafOps[i].getNext(resultTypes[i]);
break;
default: {
int errCode = 2080;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java Sat May 18 01:10:18 2013
@@ -101,12 +101,6 @@ public class POGlobalRearrange extends P
}
@Override
- public Result getNext(Tuple t) throws ExecException {
- // TODO Auto-generated method stub
- return super.getNext(t);
- }
-
- @Override
public Tuple illustratorMarkup(Object in, Object out, int eqClassIndex) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POJoinPackage.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POJoinPackage.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POJoinPackage.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POJoinPackage.java Sat May 18 01:10:18 2013
@@ -104,7 +104,7 @@ public class POJoinPackage extends POPac
* so we need to maintain internal status to keep tracking of where we are.
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
if(firstTime){
firstTime = false;
@@ -119,7 +119,7 @@ public class POJoinPackage extends POPac
// has still not returned all output, process it
if (forEach.processingPlan)
{
- forEachResult = forEach.getNext(t1);
+ forEachResult = forEach.getNextTuple();
switch (forEachResult.returnStatus)
{
case POStatus.STATUS_OK:
@@ -222,7 +222,7 @@ public class POJoinPackage extends POPac
forEach.attachInput(res);
// pull output tuple from ForEach
- Result forEachResult = forEach.getNext(t1);
+ Result forEachResult = forEach.getNextTuple();
{
switch (forEachResult.returnStatus)
{
@@ -262,7 +262,7 @@ public class POJoinPackage extends POPac
forEach.attachInput(res);
// pull output tuple from ForEach
- Result forEachResult = forEach.getNext(t1);
+ Result forEachResult = forEach.getNextTuple();
{
switch (forEachResult.returnStatus)
{
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java Sat May 18 01:10:18 2013
@@ -84,7 +84,7 @@ public class POLimit extends PhysicalOpe
* limit, return EOP; Otherwise, return the tuple
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
// if it is the first time, evaluate the expression. Otherwise reuse the computed value.
if (this.getLimit() < 0 && expressionPlan != null) {
PhysicalOperator expression = expressionPlan.getLeaves().get(0);
@@ -92,14 +92,14 @@ public class POLimit extends PhysicalOpe
Result returnValue;
switch (expression.getResultType()) {
case DataType.LONG:
- returnValue = expression.getNext(dummyLong);
+ returnValue = expression.getNextLong();
if (returnValue.returnStatus != POStatus.STATUS_OK || returnValue.result == null)
throw new RuntimeException("Unable to evaluate Limit expression: "
+ returnValue);
variableLimit = (Long) returnValue.result;
break;
case DataType.INTEGER:
- returnValue = expression.getNext(dummyInt);
+ returnValue = expression.getNextInteger();
if (returnValue.returnStatus != POStatus.STATUS_OK || returnValue.result == null)
throw new RuntimeException("Unable to evaluate Limit expression: "
+ returnValue);
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java Sat May 18 01:10:18 2013
@@ -115,7 +115,7 @@ public class POLoad extends PhysicalOper
* of EOP and hence the tearDown of connection
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
if(!setUpDone && lFile!=null){
try {
setUp();
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java Sat May 18 01:10:18 2013
@@ -255,7 +255,7 @@ public class POLocalRearrange extends Ph
* format, i.e, (key,indexedTuple(value))
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result inp = null;
Result res = ERR_RESULT;
@@ -301,7 +301,7 @@ public class POLocalRearrange extends Ph
case DataType.DATETIME:
case DataType.MAP:
case DataType.TUPLE:
- res = op.getNext(getDummy(op.getResultType()), op.getResultType());
+ res = op.getNext(op.getResultType());
break;
default:
log.error("Invalid result type: " + DataType.findType(op.getResultType()));
@@ -334,7 +334,7 @@ public class POLocalRearrange extends Ph
case DataType.DATETIME:
case DataType.MAP:
case DataType.TUPLE:
- res = op.getNext(getDummy(op.getResultType()), op.getResultType());
+ res = op.getNext(op.getResultType());
break;
default:
log.error("Invalid result type: " + DataType.findType(op.getResultType()));
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java Sat May 18 01:10:18 2013
@@ -117,7 +117,7 @@ public class POMergeCogroup extends Phys
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
try{
if(createNewBags){
@@ -417,7 +417,7 @@ public class POMergeCogroup extends Phys
// Each index entry is read as a pair of split index and a tuple consisting of key.
List<Pair<Integer,Tuple>> index = new ArrayList<Pair<Integer,Tuple>>();
- for(Result res=ld.getNext(dummyTuple);res.returnStatus!=POStatus.STATUS_EOP;res=ld.getNext(dummyTuple)){
+ for(Result res = ld.getNextTuple(); res.returnStatus != POStatus.STATUS_EOP; res = ld.getNextTuple()){
Tuple idxTuple = (Tuple)res.result;
int colCnt = idxTuple.size()-2;
@@ -459,7 +459,7 @@ public class POMergeCogroup extends Phys
//Separate Key & Value of input using corresponding LR operator
POLocalRearrange lr = LRs[lrIdx];
lr.attachInput(inp);
- Result lrOut = lr.getNext(dummyTuple);
+ Result lrOut = lr.getNextTuple();
if(lrOut.returnStatus!=POStatus.STATUS_OK){
int errCode = 2167;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java Sat May 18 01:10:18 2013
@@ -269,7 +269,7 @@ public class POMergeJoin extends Physica
@SuppressWarnings("unchecked")
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Object curLeftKey;
Result curLeftInp;
@@ -341,7 +341,7 @@ public class POMergeJoin extends Physica
rightTupSize = curJoiningRightTup.size();
counter = leftTuples.size();
doingJoin = true;
- return this.getNext(dummyTuple);
+ return this.getNextTuple();
}
else if(cmpval > 0){ // We got ahead on right side. Store currently read right tuple.
@@ -438,7 +438,7 @@ public class POMergeJoin extends Physica
doingJoin = true;
prevLeftInp = curLeftInp;
prevLeftKey = curLeftKey;
- return this.getNext(dummyTuple);
+ return this.getNextTuple();
}
// We will get here only when curLeftKey > prevRightKey
@@ -484,7 +484,7 @@ public class POMergeJoin extends Physica
doingJoin = true;
prevLeftInp = curLeftInp;
prevLeftKey = curLeftKey;
- return this.getNext(dummyTuple);
+ return this.getNextTuple();
}
else{ // We got ahead on right side. Store currently read right tuple.
@@ -556,7 +556,7 @@ public class POMergeJoin extends Physica
return new Result(POStatus.STATUS_OK, t);
}
} else {
- Result res = rightPipelineLeaf.getNext(dummyTuple);
+ Result res = rightPipelineLeaf.getNextTuple();
rightPipelineLeaf.detachInput();
switch(res.returnStatus){
case POStatus.STATUS_OK:
@@ -599,7 +599,7 @@ public class POMergeJoin extends Physica
//Separate Key & Value of input using corresponding LR operator
POLocalRearrange lr = LRs[lrIdx];
lr.attachInput((Tuple)inp.result);
- Result lrOut = lr.getNext(dummyTuple);
+ Result lrOut = lr.getNextTuple();
lr.detachInput();
if(lrOut.returnStatus!=POStatus.STATUS_OK){
int errCode = 2167;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMultiQueryPackage.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMultiQueryPackage.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMultiQueryPackage.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMultiQueryPackage.java Sat May 18 01:10:18 2013
@@ -207,7 +207,7 @@ public class POMultiQueryPackage extends
* is an indexed WritableComparable, not the wrapped value as a pig type.
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
byte origIndex = myKey.getIndex();
@@ -235,7 +235,7 @@ public class POMultiQueryPackage extends
pack.attachInput(curKey, tupIter);
- Result res = pack.getNext(t);
+ Result res = pack.getNextTuple();
pack.detachInput();
Tuple tuple = (Tuple)res.result;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java Sat May 18 01:10:18 2013
@@ -23,7 +23,6 @@ import java.util.LinkedList;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.data.DataType;
-import org.apache.pig.data.Tuple;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.POStatus;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
@@ -90,7 +89,7 @@ public class POOptimizedForEach extends
* to denote the begin and end of the nested plan processing.
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result res = null;
Result inp = null;
//The nested plan is under processing
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java Sat May 18 01:10:18 2013
@@ -218,7 +218,7 @@ public class POPackage extends PhysicalO
* is (key, {bag of tuples from input 1}, {bag of tuples from input 2}, ...)
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Tuple res;
if(firstTime){
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackageLite.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackageLite.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackageLite.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackageLite.java Sat May 18 01:10:18 2013
@@ -163,7 +163,7 @@ public class POPackageLite extends POPac
* DefaultDataBag.
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Tuple res;
//Create numInputs bags
ReadOnceBag db = null;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java Sat May 18 01:10:18 2013
@@ -129,7 +129,7 @@ public class POPartialAgg extends Physic
}
@Override
- public Result getNext(Tuple __ignored__) throws ExecException {
+ public Result getNextTuple() throws ExecException {
// accumulate tuples from processInput in rawInputMap.
// when the maps grow to mem limit, go over each item in map, and call
// combiner aggs on each collection.
@@ -463,7 +463,7 @@ public class POPartialAgg extends Physic
case DataType.DATETIME:
case DataType.MAP:
case DataType.TUPLE:
- res = op.getNext(getDummy(op.getResultType()), op.getResultType());
+ res = op.getNext(op.getResultType());
break;
default:
String msg = "Invalid result type: "
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java Sat May 18 01:10:18 2013
@@ -125,7 +125,7 @@ public class POPartitionRearrange extend
* format, i.e, (key,indexedTuple(value))
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result inp = null;
Result res = null;
@@ -153,7 +153,7 @@ public class POPartitionRearrange extend
}
List<Result> resLst = new ArrayList<Result>();
for (ExpressionOperator op : leafOps){
- res = op.getNext(getDummy(op.getResultType()), op.getResultType());
+ res = op.getNext(op.getResultType());
if(res.returnStatus!=POStatus.STATUS_OK) {
return new Result();
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java Sat May 18 01:10:18 2013
@@ -118,7 +118,7 @@ public class POPreCombinerLocalRearrange
* format, i.e, (key,indexedTuple(value))
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result inp = null;
Result res = ERR_RESULT;
@@ -151,7 +151,7 @@ public class POPreCombinerLocalRearrange
case DataType.DATETIME:
case DataType.MAP:
case DataType.TUPLE:
- res = op.getNext(getDummy(op.getResultType()), op.getResultType());
+ res = op.getNext(op.getResultType());
break;
default:
log.error("Invalid result type: "
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java Sat May 18 01:10:18 2013
@@ -119,7 +119,7 @@ public class PORank extends PhysicalOper
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result inp = null;
while (true) {
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java Sat May 18 01:10:18 2013
@@ -192,7 +192,7 @@ public class POSort extends PhysicalOper
case DataType.BIGDECIMAL:
case DataType.DATETIME:
case DataType.TUPLE:
- res = Op.getNext(getDummy(resultType), resultType);
+ res = Op.getNext(resultType);
break;
default: {
@@ -221,7 +221,7 @@ public class POSort extends PhysicalOper
Integer i = null;
Result res = null;
try {
- res = mSortFunc.getNext(i);
+ res = mSortFunc.getNextInteger();
} catch (ExecException e) {
log.error("Input not ready. Error on reading from input. "
@@ -251,7 +251,7 @@ public class POSort extends PhysicalOper
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result res = new Result();
if (!inputsAccumulated) {
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java Sat May 18 01:10:18 2013
@@ -57,7 +57,7 @@ public class POSortedDistinct extends PO
}
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
while(true) {
Result in = processInput();
if (in.returnStatus == POStatus.STATUS_NULL) {
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java Sat May 18 01:10:18 2013
@@ -201,7 +201,7 @@ public class POSplit extends PhysicalOpe
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
if (this.parentPlan.endOfAllInput) {
@@ -252,7 +252,7 @@ public class POSplit extends PhysicalOpe
while (true) {
- res = leaf.getNext(dummyTuple);
+ res = leaf.getNextTuple();
if (res.returnStatus == POStatus.STATUS_OK) {
break;
@@ -297,7 +297,7 @@ public class POSplit extends PhysicalOpe
}
PhysicalOperator leaf = myPlans.get(idx).getLeaves().get(0);
- res = leaf.getNext(dummyTuple);
+ res = leaf.getNextTuple();
if (res.returnStatus == POStatus.STATUS_EOP) {
processedSet.set(idx++);
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java Sat May 18 01:10:18 2013
@@ -137,7 +137,7 @@ public class POStore extends PhysicalOpe
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result res = processInput();
try {
switch (res.returnStatus) {
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java Sat May 18 01:10:18 2013
@@ -122,7 +122,7 @@ public class POStream extends PhysicalOp
* @see org.apache.pig.backend.hadoop.executionengine.physicalLayer.PhysicalOperator#getNext(org.apache.pig.data.Tuple)
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
// The POStream Operator works with ExecutableManager to
// send input to the streaming binary and to get output
// from it. To achieve a tuple oriented behavior, two queues
@@ -171,7 +171,7 @@ public class POStream extends PhysicalOp
// to the streaming binary - check if we are being called
// from close() on the map or reduce
if(this.parentPlan.endOfAllInput) {
- Result r = getNextHelper(t);
+ Result r = getNextHelper((Tuple)null);
if(r.returnStatus == POStatus.STATUS_EOP) {
// we have now seen *ALL* possible input
// check if we ever had any real input
@@ -219,7 +219,7 @@ public class POStream extends PhysicalOp
// we are not being called from close() - so
// we must be called from either map() or reduce()
// get the next Result from helper
- Result r = getNextHelper(t);
+ Result r = getNextHelper((Tuple)null);
if(r.returnStatus == POStatus.STATUS_EOS) {
// If we received EOS, it means all output
// from the streaming binary has been sent to us
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java Sat May 18 01:10:18 2013
@@ -118,7 +118,7 @@ public class POUnion extends PhysicalOpe
* around each non-drained input
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
if (nextReturnEOP) {
nextReturnEOP = false ;
@@ -164,7 +164,7 @@ public class POUnion extends PhysicalOpe
if(getReporter()!=null) {
getReporter().progress();
}
- res = inputs.get(ind).getNext(t);
+ res = inputs.get(ind).getNextTuple();
lastInd = ind + 1;
if(res.returnStatus == POStatus.STATUS_OK ||
Modified: pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java (original)
+++ pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java Sat May 18 01:10:18 2013
@@ -118,7 +118,7 @@ public class DefaultIndexableLoader exte
PigContext pc = new PigContext(ExecType.LOCAL, props);
ld.setPc(pc);
index = new LinkedList<Tuple>();
- for(Result res=ld.getNext(dummyTuple);res.returnStatus!=POStatus.STATUS_EOP;res=ld.getNext(dummyTuple))
+ for(Result res=ld.getNextTuple();res.returnStatus!=POStatus.STATUS_EOP;res=ld.getNextTuple())
index.offer((Tuple) res.result);
Modified: pig/trunk/test/org/apache/pig/test/PORead.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/PORead.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/PORead.java (original)
+++ pig/trunk/test/org/apache/pig/test/PORead.java Sat May 18 01:10:18 2013
@@ -65,7 +65,7 @@ public class PORead extends PhysicalOper
}
@Override
- public Result getNext(Tuple t) {
+ public Result getNextTuple() {
if (it == null) {
it = bag.iterator();
}
Modified: pig/trunk/test/org/apache/pig/test/TestAdd.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestAdd.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestAdd.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestAdd.java Sat May 18 01:10:18 2013
@@ -67,18 +67,18 @@ public class TestAdd {
DataBag inpdb2 = GenRandomData.genRandSmallTupDataBag(r, 10, 100);
lt.setValue(inpdb1);
rt.setValue(inpdb2);
- Result resdb = op.getNext(inpdb1);
+ Result resdb = op.getNextDataBag();
assertEquals(POStatus.STATUS_ERR, resdb.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpdb2);
- resdb = op.getNext(inpdb1);
+ resdb = op.getNextDataBag();
assertEquals(POStatus.STATUS_ERR, resdb.returnStatus);
// test with null in rhs
lt.setValue(inpdb1);
rt.setValue(null);
- resdb = op.getNext(inpdb1);
+ resdb = op.getNextDataBag();
assertEquals(POStatus.STATUS_ERR, resdb.returnStatus);
break;
case DataType.BOOLEAN:
@@ -86,18 +86,18 @@ public class TestAdd {
Boolean inpb2 = r.nextBoolean();
lt.setValue(inpb1);
rt.setValue(inpb2);
- Result resb = op.getNext(inpb1);
+ Result resb = op.getNextBoolean();
assertEquals(POStatus.STATUS_ERR, resb.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpb2);
- resb = op.getNext(inpb1);
+ resb = op.getNextBoolean();
assertEquals(POStatus.STATUS_ERR, resb.returnStatus);
// test with null in rhs
lt.setValue(inpb1);
rt.setValue(null);
- resb = op.getNext(inpb1);
+ resb = op.getNextBoolean();
assertEquals(POStatus.STATUS_ERR, resb.returnStatus);
break;
case DataType.BYTEARRAY: {
@@ -105,7 +105,7 @@ public class TestAdd {
DataByteArray inpba2 = GenRandomData.genRandDBA(r);
lt.setValue(inpba1);
rt.setValue(inpba2);
- Result resba = op.getNext(inpba1);
+ Result resba = op.getNextDataByteArray();
// DataByteArray expected = new DataByteArray(inpba1.toString() +
// inpba2.toString());
// assertEquals(expected, (DataByteArray)resba.result);
@@ -114,12 +114,12 @@ public class TestAdd {
// test with null in lhs
lt.setValue(null);
rt.setValue(inpba2);
- resba = op.getNext(inpba1);
+ resba = op.getNextDataByteArray();
assertEquals(POStatus.STATUS_ERR, resba.returnStatus);
// test with null in rhs
lt.setValue(inpba1);
rt.setValue(null);
- resba = op.getNext(inpba1);
+ resba = op.getNextDataByteArray();
assertEquals(POStatus.STATUS_ERR, resba.returnStatus);
break;
}
@@ -128,7 +128,7 @@ public class TestAdd {
String inps2 = GenRandomData.genRandString(r);
lt.setValue(inps1);
rt.setValue(inps2);
- Result ress = op.getNext(inps1);
+ Result ress = op.getNextString();
/*
* String expected = new String(inps1 + inps2);
* assertEquals(expected, (String)ress.result);
@@ -138,12 +138,12 @@ public class TestAdd {
// test with null in lhs
lt.setValue(null);
rt.setValue(inps2);
- ress = op.getNext(inps1);
+ ress = op.getNextString();
assertEquals(POStatus.STATUS_ERR, ress.returnStatus);
// test with null in rhs
lt.setValue(inps1);
rt.setValue(null);
- ress = op.getNext(inps1);
+ ress = op.getNextString();
assertEquals(POStatus.STATUS_ERR, ress.returnStatus);
break;
}
@@ -152,19 +152,19 @@ public class TestAdd {
Double inpd2 = r.nextDouble();
lt.setValue(inpd1);
rt.setValue(inpd2);
- Result resd = op.getNext(inpd1);
+ Result resd = op.getNextDouble();
Double expected = new Double(inpd1 + inpd2);
assertEquals(expected, (Double) resd.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpd2);
- resd = op.getNext(inpd1);
+ resd = op.getNextDouble();
assertNull(resd.result);
// test with null in rhs
lt.setValue(inpd1);
rt.setValue(null);
- resd = op.getNext(inpd1);
+ resd = op.getNextDouble();
assertNull(resd.result);
break;
}
@@ -173,19 +173,19 @@ public class TestAdd {
Float inpf2 = r.nextFloat();
lt.setValue(inpf1);
rt.setValue(inpf2);
- Result resf = op.getNext(inpf1);
+ Result resf = op.getNextFloat();
Float expected = new Float(inpf1 + inpf2);
assertEquals(expected, (Float) resf.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpf2);
- resf = op.getNext(inpf1);
+ resf = op.getNextFloat();
assertNull(resf.result);
// test with null in rhs
lt.setValue(inpf1);
rt.setValue(null);
- resf = op.getNext(inpf1);
+ resf = op.getNextFloat();
assertNull(resf.result);
break;
}
@@ -194,19 +194,19 @@ public class TestAdd {
Integer inpi2 = r.nextInt();
lt.setValue(inpi1);
rt.setValue(inpi2);
- Result resi = op.getNext(inpi1);
+ Result resi = op.getNextInteger();
Integer expected = new Integer(inpi1 + inpi2);
assertEquals(expected, (Integer) resi.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpi2);
- resi = op.getNext(inpi1);
+ resi = op.getNextInteger();
assertNull(resi.result);
// test with null in rhs
lt.setValue(inpi1);
rt.setValue(null);
- resi = op.getNext(inpi1);
+ resi = op.getNextInteger();
assertNull(resi.result);
break;
}
@@ -215,19 +215,19 @@ public class TestAdd {
Long inpl2 = r.nextLong();
lt.setValue(inpl1);
rt.setValue(inpl2);
- Result resl = op.getNext(inpl1);
+ Result resl = op.getNextLong();
Long expected = new Long(inpl1 + inpl2);
assertEquals(expected, (Long) resl.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpl2);
- resl = op.getNext(inpl1);
+ resl = op.getNextLong();
assertNull(resl.result);
// test with null in rhs
lt.setValue(inpl1);
rt.setValue(null);
- resl = op.getNext(inpl1);
+ resl = op.getNextLong();
assertNull(resl.result);
break;
}
@@ -236,18 +236,18 @@ public class TestAdd {
DateTime inpdt2 = new DateTime(r.nextLong());
lt.setValue(inpdt1);
rt.setValue(inpdt2);
- Result resdt = op.getNext(inpdt1);
+ Result resdt = op.getNextDateTime();
assertEquals(POStatus.STATUS_ERR, resdt.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpdt2);
- resdt = op.getNext(inpdt1);
+ resdt = op.getNextDateTime();
assertEquals(POStatus.STATUS_ERR, resdt.returnStatus);
// test with null in rhs
lt.setValue(inpdt1);
rt.setValue(null);
- resdt = op.getNext(inpdt1);
+ resdt = op.getNextDateTime();
assertEquals(POStatus.STATUS_ERR, resdt.returnStatus);
break;
case DataType.MAP: {
@@ -255,18 +255,18 @@ public class TestAdd {
Map<String, Object> inpm2 = GenRandomData.genRandMap(r, 10);
lt.setValue(inpm1);
rt.setValue(inpm2);
- Result resm = op.getNext(inpm1);
+ Result resm = op.getNextMap();
assertEquals(POStatus.STATUS_ERR, resm.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpm2);
- resm = op.getNext(inpm1);
+ resm = op.getNextMap();
assertEquals(POStatus.STATUS_ERR, resm.returnStatus);
// test with null in rhs
lt.setValue(inpm1);
rt.setValue(null);
- resm = op.getNext(inpm1);
+ resm = op.getNextMap();
assertEquals(POStatus.STATUS_ERR, resm.returnStatus);
break;
}
@@ -275,18 +275,18 @@ public class TestAdd {
Tuple inpt2 = GenRandomData.genRandSmallBagTuple(r, 10, 100);
lt.setValue(inpt1);
rt.setValue(inpt2);
- Result rest = op.getNext(inpt1);
+ Result rest = op.getNextTuple();
assertEquals(POStatus.STATUS_ERR, rest.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpt2);
- rest = op.getNext(inpt1);
+ rest = op.getNextTuple();
assertEquals(POStatus.STATUS_ERR, rest.returnStatus);
// test with null in rhs
lt.setValue(inpt1);
rt.setValue(null);
- rest = op.getNext(inpt1);
+ rest = op.getNextTuple();
assertEquals(POStatus.STATUS_ERR, rest.returnStatus);
break;
} //TODO add case for BigInteger and BigDecimal
Modified: pig/trunk/test/org/apache/pig/test/TestBoolean.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestBoolean.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestBoolean.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestBoolean.java Sat May 18 01:10:18 2013
@@ -41,7 +41,6 @@ public class TestBoolean {
ConstantExpression lt, rt;
BinaryExpressionOperator bop;
UnaryExpressionOperator uop;
- Boolean dummy = new Boolean(true);
@Before
public void setUp() throws Exception {
@@ -84,7 +83,7 @@ public class TestBoolean {
for (int i = 0; i < testWith.length; i++) {
lt.setValue(null);
rt.setValue(testWith[i]);
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
if (testWith[i] != null && testWith[i] == false) {
// if rhs is false, result is false
@@ -99,7 +98,7 @@ public class TestBoolean {
for (int i = 0; i < testWith.length; i++) {
lt.setValue(testWith[i]);
rt.setValue(null);
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
if (testWith[i] != null && testWith[i] == false) {
// if lhs is false, result is false
@@ -126,7 +125,7 @@ public class TestBoolean {
for (int i = 0; i < testWith.length; i++) {
lt.setValue(null);
rt.setValue(testWith[i]);
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
if (testWith[i] != null && testWith[i] == true) {
// if rhs is true, result is true
@@ -141,7 +140,7 @@ public class TestBoolean {
for (int i = 0; i < testWith.length; i++) {
lt.setValue(testWith[i]);
rt.setValue(null);
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
if (testWith[i] != null && testWith[i] == true) {
// if lhs is true, result is true
@@ -158,7 +157,7 @@ public class TestBoolean {
setupAnd();
lt.setValue(new Boolean(false));
rt.setValue(new Boolean(true));
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertFalse((Boolean) res.result);
}
@@ -168,7 +167,7 @@ public class TestBoolean {
setupAnd();
lt.setValue(new Boolean(true));
rt.setValue(new Boolean(false));
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertFalse((Boolean) res.result);
}
@@ -178,7 +177,7 @@ public class TestBoolean {
setupAnd();
lt.setValue(new Boolean(false));
rt.setValue(new Boolean(false));
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertFalse((Boolean) res.result);
}
@@ -188,7 +187,7 @@ public class TestBoolean {
setupAnd();
lt.setValue(new Boolean(true));
rt.setValue(new Boolean(true));
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertTrue((Boolean) res.result);
}
@@ -198,7 +197,7 @@ public class TestBoolean {
setupOr();
lt.setValue(new Boolean(false));
rt.setValue(new Boolean(true));
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertTrue((Boolean) res.result);
}
@@ -208,7 +207,7 @@ public class TestBoolean {
setupOr();
lt.setValue(new Boolean(true));
rt.setValue(new Boolean(false));
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertTrue((Boolean) res.result);
}
@@ -218,7 +217,7 @@ public class TestBoolean {
setupOr();
lt.setValue(new Boolean(false));
rt.setValue(new Boolean(false));
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertFalse((Boolean) res.result);
}
@@ -228,7 +227,7 @@ public class TestBoolean {
setupOr();
lt.setValue(new Boolean(true));
rt.setValue(new Boolean(true));
- Result res = bop.getNext(dummy);
+ Result res = bop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertTrue((Boolean) res.result);
}
@@ -237,7 +236,7 @@ public class TestBoolean {
public void testNotTrue() throws ExecException {
setupNot();
lt.setValue(new Boolean(true));
- Result res = uop.getNext(dummy);
+ Result res = uop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertFalse((Boolean) res.result);
}
@@ -246,7 +245,7 @@ public class TestBoolean {
public void testNotFalse() throws ExecException {
setupNot();
lt.setValue(new Boolean(false));
- Result res = uop.getNext(dummy);
+ Result res = uop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertTrue((Boolean) res.result);
}
@@ -255,7 +254,7 @@ public class TestBoolean {
public void testNotNull() throws ExecException {
setupNot();
lt.setValue(null);
- Result res = uop.getNext(dummy);
+ Result res = uop.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertNull(res.result);
}
Modified: pig/trunk/test/org/apache/pig/test/TestCharArrayToNumeric.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestCharArrayToNumeric.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestCharArrayToNumeric.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestCharArrayToNumeric.java Sat May 18 01:10:18 2013
@@ -92,7 +92,7 @@ public class TestCharArrayToNumeric {
Tuple tuple = TupleFactory.getInstance().newTuple(1);
tuple.set(0, items[i]);
proj.attachInput(tuple);
- Double actual = (Double)cast.getNext(dummyDouble).result;
+ Double actual = (Double)cast.getNextDouble().result;
if (doubleExpected[i] != null) {
assertEquals(doubleExpected[i], actual, 1e-6);
} else {
@@ -109,7 +109,7 @@ public class TestCharArrayToNumeric {
Tuple tuple = TupleFactory.getInstance().newTuple(1);
tuple.set(0, items[i]);
proj.attachInput(tuple);
- Float actual = (Float)cast.getNext(dummyFloat).result;
+ Float actual = (Float)cast.getNextFloat().result;
if (floatExpected[i] != null) {
assertEquals(floatExpected[i], actual, 1e-6);
} else {
@@ -125,7 +125,7 @@ public class TestCharArrayToNumeric {
Tuple tuple = TupleFactory.getInstance().newTuple(1);
tuple.set(0, items[i]);
proj.attachInput(tuple);
- Long actual = (Long)cast.getNext(dummyLong).result;
+ Long actual = (Long)cast.getNextLong().result;
if (longExpected[i] != null) {
assertEquals(longExpected[i], actual);
} else {
@@ -141,7 +141,7 @@ public class TestCharArrayToNumeric {
Tuple tuple = TupleFactory.getInstance().newTuple(1);
tuple.set(0, items[i]);
proj.attachInput(tuple);
- Integer actual = (Integer)cast.getNext(dummyInteger).result;
+ Integer actual = (Integer)cast.getNextInteger().result;
if (intExpected[i] != null) {
assertEquals(intExpected[i], actual);
} else {
Modified: pig/trunk/test/org/apache/pig/test/TestConstExpr.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestConstExpr.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestConstExpr.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestConstExpr.java Sat May 18 01:10:18 2013
@@ -39,13 +39,13 @@ public class TestConstExpr {
public void testGetNextInteger() throws ExecException {
Integer inp = r.nextInt();
ce.setValue(inp);
- Result resi = ce.getNext(inp);
+ Result resi = ce.getNextInteger();
Integer ret = (Integer)resi.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- resi = ce.getNext(inp);
+ resi = ce.getNextInteger();
ret = (Integer)resi.result;
assertNull(ret);
}
@@ -54,13 +54,13 @@ public class TestConstExpr {
public void testGetNextLong() throws ExecException {
Long inp = r.nextLong();
ce.setValue(inp);
- Result resl = ce.getNext(inp);
+ Result resl = ce.getNextLong();
Long ret = (Long)resl.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- resl = ce.getNext(inp);
+ resl = ce.getNextLong();
ret = (Long)resl.result;
assertNull(ret);
}
@@ -69,13 +69,13 @@ public class TestConstExpr {
public void testGetNextDouble() throws ExecException {
Double inp = r.nextDouble();
ce.setValue(inp);
- Result resd = ce.getNext(inp);
+ Result resd = ce.getNextDouble();
Double ret = (Double)resd.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- resd = ce.getNext(inp);
+ resd = ce.getNextDouble();
ret = (Double)resd.result;
assertNull(ret);
}
@@ -84,13 +84,13 @@ public class TestConstExpr {
public void testGetNextFloat() throws ExecException {
Float inp = r.nextFloat();
ce.setValue(inp);
- Result resf = ce.getNext(inp);
+ Result resf = ce.getNextFloat();
Float ret = (Float)resf.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- resf = ce.getNext(inp);
+ resf = ce.getNextFloat();
ret = (Float)resf.result;
assertNull(ret);
}
@@ -99,13 +99,13 @@ public class TestConstExpr {
public void testGetNextString() throws ExecException {
String inp = GenRandomData.genRandString(r);
ce.setValue(inp);
- Result ress = ce.getNext(inp);
+ Result ress = ce.getNextString();
String ret = (String)ress.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- ress = ce.getNext(inp);
+ ress = ce.getNextString();
ret = (String)ress.result;
assertNull(ret);
}
@@ -114,13 +114,13 @@ public class TestConstExpr {
public void testGetNextDataByteArray() throws ExecException {
DataByteArray inp = GenRandomData.genRandDBA(r);
ce.setValue(inp);
- Result resba = ce.getNext(inp);
+ Result resba = ce.getNextDataByteArray();
DataByteArray ret = (DataByteArray)resba.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- resba = ce.getNext(inp);
+ resba = ce.getNextDataByteArray();
ret = (DataByteArray)resba.result;
assertNull(ret);
}
@@ -129,13 +129,13 @@ public class TestConstExpr {
public void testGetNextMap() throws ExecException {
Map<String, Object> inp = GenRandomData.genRandMap(r, 10);
ce.setValue(inp);
- Result resm = ce.getNext(inp);
+ Result resm = ce.getNextMap();
Map<Integer, String> ret = (Map)resm.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- resm = ce.getNext(inp);
+ resm = ce.getNextMap();
ret = (Map)resm.result;
assertNull(ret);
}
@@ -144,13 +144,13 @@ public class TestConstExpr {
public void testGetNextBoolean() throws ExecException {
Boolean inp = r.nextBoolean();
ce.setValue(inp);
- Result res = ce.getNext(inp);
+ Result res = ce.getNextBoolean();
Boolean ret = (Boolean)res.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- res = ce.getNext(inp);
+ res = ce.getNextBoolean();
ret = (Boolean)res.result;
assertNull(ret);
}
@@ -159,13 +159,13 @@ public class TestConstExpr {
public void testGetNextTuple() throws ExecException {
Tuple inp = GenRandomData.genRandSmallBagTuple(r, 10, 100);
ce.setValue(inp);
- Result rest = ce.getNext(inp);
+ Result rest = ce.getNextTuple();
Tuple ret = (Tuple)rest.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- rest = ce.getNext(inp);
+ rest = ce.getNextTuple();
ret = (Tuple)rest.result;
assertNull(ret);
}
@@ -174,13 +174,13 @@ public class TestConstExpr {
public void testGetNextDataBag() throws ExecException {
DataBag inp = GenRandomData.genRandSmallTupDataBag(r, 10, 100);
ce.setValue(inp);
- Result res = ce.getNext(inp);
+ Result res = ce.getNextDataBag();
DataBag ret = (DataBag)res.result;
assertEquals(inp, ret);
// test with null input
ce.setValue(null);
- res = ce.getNext(inp);
+ res = ce.getNextDataBag();
ret = (DataBag)res.result;
assertNull(ret);
}
Modified: pig/trunk/test/org/apache/pig/test/TestDivide.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestDivide.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestDivide.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestDivide.java Sat May 18 01:10:18 2013
@@ -69,18 +69,18 @@ public class TestDivide {
DataBag inpdb2 = GenRandomData.genRandSmallTupDataBag(r, 10, 100);
lt.setValue(inpdb1);
rt.setValue(inpdb2);
- Result resdb = op.getNext(inpdb1);
+ Result resdb = op.getNextDataBag();
assertEquals(resdb.returnStatus, POStatus.STATUS_ERR);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpdb2);
- resdb = op.getNext(inpdb1);
+ resdb = op.getNextDataBag();
assertEquals(resdb.returnStatus, POStatus.STATUS_ERR);
// test with null in rhs
lt.setValue(inpdb1);
rt.setValue(null);
- resdb = op.getNext(inpdb1);
+ resdb = op.getNextDataBag();
assertEquals(resdb.returnStatus, POStatus.STATUS_ERR);
break;
case DataType.BOOLEAN:
@@ -88,18 +88,18 @@ public class TestDivide {
Boolean inpb2 = r.nextBoolean();
lt.setValue(inpb1);
rt.setValue(inpb2);
- Result resb = op.getNext(inpb1);
+ Result resb = op.getNextBoolean();
assertEquals(resb.returnStatus, POStatus.STATUS_ERR);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpb2);
- resb = op.getNext(inpb1);
+ resb = op.getNextBoolean();
assertEquals(resb.returnStatus, POStatus.STATUS_ERR);
// test with null in rhs
lt.setValue(inpb1);
rt.setValue(null);
- resb = op.getNext(inpb1);
+ resb = op.getNextBoolean();
assertEquals(resb.returnStatus, POStatus.STATUS_ERR);
break;
case DataType.BYTEARRAY: {
@@ -107,7 +107,7 @@ public class TestDivide {
DataByteArray inpba2 = GenRandomData.genRandDBA(r);
lt.setValue(inpba1);
rt.setValue(inpba2);
- Result resba = op.getNext(inpba1);
+ Result resba = op.getNextDataByteArray();
//DataByteArray expected = new DataByteArray(inpba1.toString() + inpba2.toString());
//assertEquals(expected, (DataByteArray)resba.result);
assertEquals(POStatus.STATUS_ERR, resba.returnStatus);
@@ -115,12 +115,12 @@ public class TestDivide {
// test with null in lhs
lt.setValue(null);
rt.setValue(inpba2);
- resba = op.getNext(inpba1);
+ resba = op.getNextDataByteArray();
assertEquals(resba.returnStatus, POStatus.STATUS_ERR);
// test with null in rhs
lt.setValue(inpba1);
rt.setValue(null);
- resba = op.getNext(inpba1);
+ resba = op.getNextDataByteArray();
assertEquals(resba.returnStatus, POStatus.STATUS_ERR);
break;
}
@@ -129,7 +129,7 @@ public class TestDivide {
String inps2 = GenRandomData.genRandString(r);
lt.setValue(inps1);
rt.setValue(inps2);
- Result ress = op.getNext(inps1);
+ Result ress = op.getNextString();
/*String expected = new String(inps1 + inps2);
assertEquals(expected, (String)ress.result);*/
assertEquals(POStatus.STATUS_ERR, ress.returnStatus);
@@ -137,12 +137,12 @@ public class TestDivide {
// test with null in lhs
lt.setValue(null);
rt.setValue(inps2);
- ress = op.getNext(inps1);
+ ress = op.getNextString();
assertEquals(ress.returnStatus, POStatus.STATUS_ERR);
// test with null in rhs
lt.setValue(inps1);
rt.setValue(null);
- ress = op.getNext(inps1);
+ ress = op.getNextString();
assertEquals(ress.returnStatus, POStatus.STATUS_ERR);
break;
}
@@ -151,24 +151,24 @@ public class TestDivide {
Double inpd2 = r.nextDouble();
lt.setValue(inpd1);
rt.setValue(inpd2);
- Result resd = op.getNext(inpd1);
+ Result resd = op.getNextDouble();
Double expected = new Double(inpd1 / inpd2);
assertEquals(expected, (Double)resd.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpd2);
- resd = op.getNext(inpd1);
+ resd = op.getNextDouble();
assertEquals(null, (Double)resd.result);
// test with null in rhs
lt.setValue(inpd1);
rt.setValue(null);
- resd = op.getNext(inpd1);
+ resd = op.getNextDouble();
assertEquals(null, (Double)resd.result);
// test divide by 0
lt.setValue(inpd1);
rt.setValue(0.0);
- resd = op.getNext(inpd1);
+ resd = op.getNextDouble();
assertEquals(null, (Double)resd.result);
break;
}
@@ -177,24 +177,24 @@ public class TestDivide {
Float inpf2 = r.nextFloat();
lt.setValue(inpf1);
rt.setValue(inpf2);
- Result resf = op.getNext(inpf1);
+ Result resf = op.getNextFloat();
Float expected = new Float(inpf1 / inpf2);
assertEquals(expected, (Float)resf.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpf2);
- resf = op.getNext(inpf1);
+ resf = op.getNextFloat();
assertEquals(null, (Float)resf.result);
// test with null in rhs
lt.setValue(inpf1);
rt.setValue(null);
- resf = op.getNext(inpf1);
+ resf = op.getNextFloat();
assertEquals(null, (Float)resf.result);
// test divide by 0
lt.setValue(inpf1);
rt.setValue(0.0f);
- resf = op.getNext(inpf1);
+ resf = op.getNextFloat();
assertEquals(null, (Float)resf.result);
break;
}
@@ -203,24 +203,24 @@ public class TestDivide {
Integer inpi2 = r.nextInt();
lt.setValue(inpi1);
rt.setValue(inpi2);
- Result resi = op.getNext(inpi1);
+ Result resi = op.getNextInteger();
Integer expected = new Integer(inpi1 / inpi2);
assertEquals(expected, (Integer) resi.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpi2);
- resi = op.getNext(inpi1);
+ resi = op.getNextInteger();
assertEquals(null, (Integer)resi.result);
// test with null in rhs
lt.setValue(inpi1);
rt.setValue(null);
- resi = op.getNext(inpi1);
+ resi = op.getNextInteger();
assertEquals(null, (Integer)resi.result);
// test divide by 0
lt.setValue(inpi1);
rt.setValue(0);
- resi = op.getNext(inpi1);
+ resi = op.getNextInteger();
assertEquals(null, (Integer)resi.result);
break;
}
@@ -229,24 +229,24 @@ public class TestDivide {
Long inpl2 = r.nextLong();
lt.setValue(inpl1);
rt.setValue(inpl2);
- Result resl = op.getNext(inpl1);
+ Result resl = op.getNextLong();
Long expected = new Long(inpl1 / inpl2);
assertEquals(expected, (Long)resl.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpl2);
- resl = op.getNext(inpl1);
+ resl = op.getNextLong();
assertEquals(null, (Long)resl.result);
// test with null in rhs
lt.setValue(inpl1);
rt.setValue(null);
- resl = op.getNext(inpl1);
+ resl = op.getNextLong();
assertEquals(null, (Long)resl.result);
// test divide by 0
lt.setValue(inpl1);
rt.setValue(0l);
- resl = op.getNext(inpl1);
+ resl = op.getNextLong();
assertEquals(null, (Long)resl.result);
break;
}
@@ -255,18 +255,18 @@ public class TestDivide {
DateTime inpdt2 = new DateTime(r.nextLong());
lt.setValue(inpdt1);
rt.setValue(inpdt2);
- Result resdt = op.getNext(inpdt1);
+ Result resdt = op.getNextDateTime();
assertEquals(resdt.returnStatus, POStatus.STATUS_ERR);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpdt2);
- resdt = op.getNext(inpdt1);
+ resdt = op.getNextDateTime();
assertEquals(resdt.returnStatus, POStatus.STATUS_ERR);
// test with null in rhs
lt.setValue(inpdt1);
rt.setValue(null);
- resdt = op.getNext(inpdt1);
+ resdt = op.getNextDateTime();
assertEquals(resdt.returnStatus, POStatus.STATUS_ERR);
break;
case DataType.MAP: {
@@ -274,18 +274,18 @@ public class TestDivide {
Map<String,Object> inpm2 = GenRandomData.genRandMap(r, 10);
lt.setValue(inpm1);
rt.setValue(inpm2);
- Result resm = op.getNext(inpm1);
+ Result resm = op.getNextMap();
assertEquals(POStatus.STATUS_ERR, resm.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpm2);
- resm = op.getNext(inpm1);
+ resm = op.getNextMap();
assertEquals(POStatus.STATUS_ERR, resm.returnStatus);
// test with null in rhs
lt.setValue(inpm1);
rt.setValue(null);
- resm = op.getNext(inpm1);
+ resm = op.getNextMap();
assertEquals(POStatus.STATUS_ERR, resm.returnStatus);
break;
}
@@ -294,18 +294,18 @@ public class TestDivide {
Tuple inpt2 = GenRandomData.genRandSmallBagTuple(r, 10, 100);
lt.setValue(inpt1);
rt.setValue(inpt2);
- Result rest = op.getNext(inpt1);
+ Result rest = op.getNextTuple();
assertEquals(POStatus.STATUS_ERR, rest.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpt2);
- rest = op.getNext(inpt1);
+ rest = op.getNextTuple();
assertEquals(POStatus.STATUS_ERR, rest.returnStatus);
// test with null in rhs
lt.setValue(inpt1);
rt.setValue(null);
- rest = op.getNext(inpt1);
+ rest = op.getNextTuple();
assertEquals(POStatus.STATUS_ERR, rest.returnStatus);
break;
}
Modified: pig/trunk/test/org/apache/pig/test/TestEqualTo.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestEqualTo.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestEqualTo.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestEqualTo.java Sat May 18 01:10:18 2013
@@ -47,7 +47,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.BOOLEAN);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -62,7 +62,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.BOOLEAN);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -82,7 +82,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.INTEGER);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -97,7 +97,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.INTEGER);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -117,7 +117,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.LONG);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -132,7 +132,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.LONG);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -152,7 +152,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.FLOAT);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -167,7 +167,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.FLOAT);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -187,7 +187,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.DOUBLE);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -202,7 +202,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.DOUBLE);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -222,7 +222,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.DATETIME);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -237,7 +237,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.DATETIME);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -257,7 +257,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.CHARARRAY);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -272,7 +272,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.CHARARRAY);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -292,7 +292,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.BYTEARRAY);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -307,7 +307,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.BYTEARRAY);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -324,7 +324,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.TUPLE);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -341,7 +341,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.TUPLE);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -361,7 +361,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.MAP);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertTrue((Boolean)r.result);
}
@@ -382,7 +382,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
g.setOperandType(DataType.MAP);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_OK, r.returnStatus);
assertFalse((Boolean)r.result);
}
@@ -405,7 +405,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull(r.result);
@@ -416,7 +416,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
- r = g.getNext(new Boolean(true));
+ r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull(r.result);
@@ -427,7 +427,7 @@ public class TestEqualTo {
g.setLhs(lt);
g.setRhs(rt);
- r = g.getNext(new Boolean(true));
+ r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull(r.result);
}
Modified: pig/trunk/test/org/apache/pig/test/TestFRJoin.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestFRJoin.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestFRJoin.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestFRJoin.java Sat May 18 01:10:18 2013
@@ -127,8 +127,8 @@ public class TestFRJoin {
ld.setPc(pc);
Tuple dummyTuple = null;
- for (Result res = ld.getNext(dummyTuple); res.returnStatus != POStatus.STATUS_EOP; res = ld
- .getNext(dummyTuple)) {
+ for (Result res = ld.getNextTuple(); res.returnStatus != POStatus.STATUS_EOP; res = ld
+ .getNextTuple()) {
Tuple tup = (Tuple)res.result;
LoadFunc lf = ((LoadFunc)pc.instantiateFuncFromSpec(ld.getLFile().getFuncSpec()));
String key = lf.getLoadCaster().bytesToCharArray(