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 [6/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/test/org/apache/pig/test/TestPOSort.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPOSort.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPOSort.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPOSort.java Sat May 18 01:10:18 2013
@@ -82,8 +82,8 @@ public class TestPOSort {
//verify
Tuple t = null;
- Result res1 = sort.getNext(t);
- Result res2 = sort.getNext(t);
+ Result res1 = sort.getNextTuple();
+ Result res2 = sort.getNextTuple();
while (res2.returnStatus != POStatus.STATUS_EOP) {
Object i1 = ((Tuple) res1.result).get(0);
@@ -94,7 +94,7 @@ public class TestPOSort {
System.out.println("RESULT2=i : " + res2.result + " i = " + i);
assertEquals(true, (i <= 0));
res1 = res2;
- res2 = sort.getNext(t);
+ res2 = sort.getNextTuple();
}
}
@@ -130,9 +130,9 @@ public class TestPOSort {
POSort sort = new POSort(new OperatorKey("", r.nextLong()), -1, inputs,
sortPlans, mAscCols, null);
Tuple t = null;
- Result res1 = sort.getNext(t);
+ Result res1 = sort.getNextTuple();
// System.out.println(res1.result);
- Result res2 = sort.getNext(t);
+ Result res2 = sort.getNextTuple();
while (res2.returnStatus != POStatus.STATUS_EOP) {
Object i1 = ((Tuple) res1.result).get(0);
Object i2 = ((Tuple) res2.result).get(0);
@@ -140,7 +140,7 @@ public class TestPOSort {
// System.out.println(res2.result + " i = " + i);
assertEquals(true, (i >= 0));
res1 = res2;
- res2 = sort.getNext(t);
+ res2 = sort.getNextTuple();
}
}
@@ -177,9 +177,9 @@ public class TestPOSort {
POSort sort = new POSort(new OperatorKey("", r.nextLong()), -1, inputs,
sortPlans, mAscCols, null);
Tuple t = null;
- Result res1 = sort.getNext(t);
+ Result res1 = sort.getNextTuple();
// System.out.println(res1.result);
- Result res2 = sort.getNext(t);
+ Result res2 = sort.getNextTuple();
while (res2.returnStatus != POStatus.STATUS_EOP) {
Object i1 = ((Tuple) res1.result).get(1);
Object i2 = ((Tuple) res2.result).get(1);
@@ -187,7 +187,7 @@ public class TestPOSort {
assertEquals(true, (i <= 0));
// System.out.println(res2.result);
res1 = res2;
- res2 = sort.getNext(t);
+ res2 = sort.getNextTuple();
}
}
@@ -220,9 +220,9 @@ public class TestPOSort {
POSort sort = new POSort(new OperatorKey("", r.nextLong()), -1, inputs,
sortPlans, mAscCols, null);
Tuple t = null;
- Result res1 = sort.getNext(t);
+ Result res1 = sort.getNextTuple();
// System.out.println(res1.result);
- Result res2 = sort.getNext(t);
+ Result res2 = sort.getNextTuple();
while (res2.returnStatus != POStatus.STATUS_EOP) {
Object i1 = ((Tuple) res1.result).get(1);
Object i2 = ((Tuple) res2.result).get(1);
@@ -230,7 +230,7 @@ public class TestPOSort {
assertEquals(true, (i >= 0));
// System.out.println(res2.result);
res1 = res2;
- res2 = sort.getNext(t);
+ res2 = sort.getNextTuple();
}
}
@@ -297,15 +297,15 @@ public class TestPOSort {
Tuple t = null;
Result res ;
// output line 1
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 1) ;
assertEquals(((Tuple) res.result).get(1), 10) ;
// output line 2
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 2) ;
assertEquals(((Tuple) res.result).get(1), 8) ;
// output line 3
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 3) ;
assertEquals(((Tuple) res.result).get(1), 8) ;
@@ -389,23 +389,23 @@ public class TestPOSort {
Tuple t = null;
Result res ;
// output line 1
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertNull(((Tuple) res.result).get(0)) ;
assertEquals(((Tuple) res.result).get(1), 10) ;
// output line 2
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 1) ;
assertEquals(((Tuple) res.result).get(1), 8) ;
// output line 3
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 3) ;
assertEquals(((Tuple) res.result).get(1), 8) ;
// output line 4
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertNull(((Tuple) res.result).get(0)) ;
assertNull(((Tuple) res.result).get(1)) ;
// output line 5
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 1 );
assertNull(((Tuple) res.result).get(1)) ;
@@ -478,15 +478,15 @@ public class TestPOSort {
Tuple t = null;
Result res ;
// output line 1
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 3) ;
assertEquals(((Tuple) res.result).get(1), 5) ;
// output line 2
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 3) ;
assertEquals(((Tuple) res.result).get(1), 8) ;
// output line 3
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 1) ;
assertEquals(((Tuple) res.result).get(1), 2) ;
@@ -569,23 +569,23 @@ public class TestPOSort {
Tuple t = null;
Result res ;
// output line 1
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 3) ;
assertEquals(((Tuple) res.result).get(1), 8) ;
// output line 2
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 1) ;
assertNull(((Tuple) res.result).get(1)) ;
// output line 3
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertEquals(((Tuple) res.result).get(0), 1) ;
assertEquals(((Tuple) res.result).get(1), 8) ;
// output line 4
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertNull(((Tuple) res.result).get(0)) ;
assertNull(((Tuple) res.result).get(1)) ;
// output line 5
- res = sort.getNext(t);
+ res = sort.getNextTuple();
assertNull(((Tuple) res.result).get(0)) ;
assertEquals(((Tuple) res.result).get(1), 10) ;
@@ -621,9 +621,9 @@ public class TestPOSort {
POSort sort = new POSort(new OperatorKey("", r.nextLong()), -1, inputs,
null, null, comparator);
Tuple t = null;
- Result res1 = sort.getNext(t);
+ Result res1 = sort.getNextTuple();
// System.out.println(res1.result);
- Result res2 = sort.getNext(t);
+ Result res2 = sort.getNextTuple();
while (res2.returnStatus != POStatus.STATUS_EOP) {
int i1 = ((Integer) ((Tuple) res1.result).get(1) == null ? 0 : (Integer) ((Tuple) res1.result).get(1));
int i2 = ((Integer) ((Tuple) res2.result).get(1) == null ? 0 : (Integer) ((Tuple) res2.result).get(1));
@@ -631,7 +631,7 @@ public class TestPOSort {
assertEquals(true, (i <= 0));
System.out.println(i + " : " + res2.result);
res1 = res2;
- res2 = sort.getNext(t);
+ res2 = sort.getNextTuple();
}
}
Modified: pig/trunk/test/org/apache/pig/test/TestPOSplit.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPOSplit.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPOSplit.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPOSplit.java Sat May 18 01:10:18 2013
@@ -84,7 +84,7 @@ public class TestPOSplit {
split.setParentPlan(pplan);
// Calling POSplit which in turn calls POCast and should fail.
- Result res = split.getNext(dummyTuple);
+ Result res = split.getNextTuple();
assertEquals("POSplit should fail when input processing fails.",
res.returnStatus, POStatus.STATUS_ERR);
Modified: pig/trunk/test/org/apache/pig/test/TestPOUserFunc.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPOUserFunc.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPOUserFunc.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPOUserFunc.java Sat May 18 01:10:18 2013
@@ -254,12 +254,12 @@ public class TestPOUserFunc {
-1, inputs, new FuncSpec(funcSpec));
Result res = new Result();
Integer i = null;
- res = userFunc.getNext(i);
+ res = userFunc.getNextInteger();
while (res.returnStatus != POStatus.STATUS_EOP) {
// System.out.println(res.result);
int result = (Integer) res.result;
assertEquals(2, result);
- res = userFunc.getNext(i);
+ res = userFunc.getNextInteger();
}
}
@@ -293,7 +293,7 @@ public class TestPOUserFunc {
userFunc.attachInput(t1, t2);
Integer i = null;
// System.out.println(t1 + " " + t2);
- int result = (Integer) (userFunc.getNext(i).result);
+ int result = (Integer) (userFunc.getNextInteger().result);
assertEquals(-1, result);
}
@@ -346,7 +346,7 @@ public class TestPOUserFunc {
po.setAlgebraicFunction(INIT);
po.attachInput(tup1);
Tuple t = null;
- Result res = po.getNext(t);
+ Result res = po.getNextTuple();
Tuple outputInitial1 = (res.returnStatus == POStatus.STATUS_OK) ? (Tuple) res.result
: null;
Tuple outputInitial2 = (res.returnStatus == POStatus.STATUS_OK) ? (Tuple) res.result
@@ -369,7 +369,7 @@ public class TestPOUserFunc {
new FuncSpec(funcSpec));
po.setAlgebraicFunction(INTERMED);
po.attachInput(outputInitial);
- res = po.getNext(t);
+ res = po.getNextTuple();
Tuple outputIntermed = (res.returnStatus == POStatus.STATUS_OK) ? (Tuple) res.result
: null;
@@ -384,7 +384,7 @@ public class TestPOUserFunc {
new FuncSpec(funcSpec));
po.setAlgebraicFunction(FINAL);
po.attachInput(outputInitial);
- res = po.getNext(t);
+ res = po.getNextTuple();
Double output = (res.returnStatus == POStatus.STATUS_OK) ? (Double) res.result
: null;
// Double output = fin.exec(outputInitial);
Modified: pig/trunk/test/org/apache/pig/test/TestPackage.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPackage.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPackage.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPackage.java Sat May 18 01:10:18 2013
@@ -87,7 +87,7 @@ public class TestPackage {
pop.setKeyInfo(keyInfo);
Tuple t = null;
Result res = null;
- res = (Result)pop.getNext(t);
+ res = (Result)pop.getNextTuple();
if (res.returnStatus == POStatus.STATUS_NULL && inner[0])
return;
assertEquals(POStatus.STATUS_OK, res.returnStatus);
Modified: pig/trunk/test/org/apache/pig/test/TestProject.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestProject.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestProject.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestProject.java Sat May 18 01:10:18 2013
@@ -80,7 +80,7 @@ public class TestProject {
int cntr = 0;
boolean contains = true;
while (true) {
- res = proj.getNext(t);
+ res = proj.getNextTuple();
if (res.returnStatus == POStatus.STATUS_EOP)
break;
if (!TestHelper.bagContains(inpBag, (Tuple)res.result)) {
@@ -95,7 +95,7 @@ public class TestProject {
proj.attachInput(t);
proj.setColumn(8);
proj.setOverloaded(false);
- res = proj.getNext(t);
+ res = proj.getNextTuple();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertEquals(t.get(8), res.result);
}
@@ -135,7 +135,7 @@ public class TestProject {
cols.add(j);
cols.add(j + 1);
proj.setColumns(cols);
- res = proj.getNext(t);
+ res = proj.getNextTuple();
if (res.returnStatus == POStatus.STATUS_EOP)
break;
TupleFactory tupleFactory = TupleFactory.getInstance();
@@ -152,7 +152,7 @@ public class TestProject {
proj.attachInput(t);
proj.setColumn(8);
proj.setOverloaded(false);
- res = proj.getNext(t);
+ res = proj.getNextTuple();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertEquals(t.get(8), res.result);
}
@@ -181,7 +181,7 @@ public class TestProject {
int cntr = 0;
boolean contains = true;
while (true) {
- res = proj.getNext(t);
+ res = proj.getNextTuple();
if (res.returnStatus == POStatus.STATUS_EOP)
break;
if (!TestHelper.bagContains(inpBag, (Tuple)res.result)) {
@@ -196,7 +196,7 @@ public class TestProject {
proj.attachInput(t);
proj.setColumn(8);
proj.setOverloaded(false);
- res = proj.getNext(t);
+ res = proj.getNextTuple();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertEquals(t.get(8), res.result);
}
@@ -236,7 +236,7 @@ public class TestProject {
cols.add(j);
cols.add(j + 1);
proj.setColumns(cols);
- res = proj.getNext(t);
+ res = proj.getNextTuple();
if (res.returnStatus == POStatus.STATUS_EOP)
break;
TupleFactory tupleFactory = TupleFactory.getInstance();
@@ -253,7 +253,7 @@ public class TestProject {
proj.attachInput(t);
proj.setColumn(8);
proj.setOverloaded(false);
- res = proj.getNext(t);
+ res = proj.getNextTuple();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertEquals(t.get(8), res.result);
}
Modified: pig/trunk/test/org/apache/pig/test/TestRegexp.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestRegexp.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestRegexp.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestRegexp.java Sat May 18 01:10:18 2013
@@ -56,21 +56,21 @@ public class TestRegexp {
lt.setValue(new String(
"The quick sly fox jumped over the lazy brown dog"));
rt.setValue(".*s.y.*");
- Result res = op.getNext(new Boolean(true));
+ Result res = op.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertTrue((Boolean)res.result);
// test with null in lhs
lt.setValue(null);
rt.setValue(".*s.y.*");
- res = op.getNext(new Boolean(true));
+ res = op.getNextBoolean();
assertNull(res.result);
// test with null in rhs
lt.setValue(new String(
"The quick sly fox jumped over the lazy brown dog"));
rt.setValue(null);
- res = op.getNext(new Boolean(true));
+ res = op.getNextBoolean();
assertNull(res.result);
}
@@ -79,7 +79,7 @@ public class TestRegexp {
lt.setValue(new String(
"The quick sly fox jumped over the lazy brown dog"));
rt.setValue(new String("zzz"));
- Result res = op.getNext(new Boolean(true));
+ Result res = op.getNextBoolean();
assertEquals(POStatus.STATUS_OK, res.returnStatus);
assertFalse((Boolean)res.result);
}
Modified: pig/trunk/test/org/apache/pig/test/TestSubtract.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestSubtract.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestSubtract.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestSubtract.java Sat May 18 01:10:18 2013
@@ -69,18 +69,18 @@ public class TestSubtract {
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:
@@ -88,18 +88,18 @@ public class TestSubtract {
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: {
@@ -107,7 +107,7 @@ public class TestSubtract {
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 TestSubtract {
// 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;
}
@@ -129,7 +129,7 @@ public class TestSubtract {
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 TestSubtract {
// 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;
}
@@ -151,19 +151,19 @@ public class TestSubtract {
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;
}
@@ -172,19 +172,19 @@ public class TestSubtract {
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;
}
@@ -193,19 +193,19 @@ public class TestSubtract {
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;
}
@@ -214,19 +214,19 @@ public class TestSubtract {
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;
}
@@ -235,18 +235,18 @@ public class TestSubtract {
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;
}
@@ -255,18 +255,18 @@ public class TestSubtract {
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 TestSubtract {
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/TestUnion.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestUnion.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestUnion.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestUnion.java Sat May 18 01:10:18 2013
@@ -147,7 +147,7 @@ public class TestUnion {
ld3.setLFile(fSpec);
DataBag fullBag = DefaultBagFactory.getInstance().newDefaultBag();
Tuple t=null;
- for(Result res=ld3.getNext(t);res.returnStatus!=POStatus.STATUS_EOP;res=ld3.getNext(t)){
+ for(Result res=ld3.getNextTuple();res.returnStatus!=POStatus.STATUS_EOP;res=ld3.getNextTuple()){
fullBag.add((Tuple)res.result);
}
@@ -168,7 +168,7 @@ public class TestUnion {
public void testGetNextTuple() throws ExecException, IOException {
Tuple t = null;
DataBag outBag = DefaultBagFactory.getInstance().newDefaultBag();
- for(Result res=sp.getNext(t);res.returnStatus!=POStatus.STATUS_EOP;res=sp.getNext(t)){
+ for(Result res=sp.getNextTuple();res.returnStatus!=POStatus.STATUS_EOP;res=sp.getNextTuple()){
outBag.add(castToDBA((Tuple)res.result));
}
assertTrue(TestHelper.compareBags(expBag, outBag));
Modified: pig/trunk/test/org/apache/pig/test/utils/POCastDummy.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/utils/POCastDummy.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/utils/POCastDummy.java (original)
+++ pig/trunk/test/org/apache/pig/test/utils/POCastDummy.java Sat May 18 01:10:18 2013
@@ -69,8 +69,8 @@ public class POCastDummy extends Express
}
@Override
- public Result getNext(Integer i) throws ExecException {
- Result res = inputs.get(0).getNext(i);
+ public Result getNextInteger() throws ExecException {
+ Result res = inputs.get(0).getNextInteger();
if(res.returnStatus != POStatus.STATUS_OK){
return res;
@@ -85,8 +85,8 @@ public class POCastDummy extends Express
}
@Override
- public Result getNext(String s) throws ExecException {
- Result res = inputs.get(0).getNext(s);
+ public Result getNextString() throws ExecException {
+ Result res = inputs.get(0).getNextString();
if(res.returnStatus != POStatus.STATUS_OK){
return res;
Modified: pig/trunk/test/org/apache/pig/test/utils/TestHelper.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/utils/TestHelper.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/utils/TestHelper.java (original)
+++ pig/trunk/test/org/apache/pig/test/utils/TestHelper.java Sat May 18 01:10:18 2013
@@ -215,7 +215,7 @@ public class TestHelper {
int numActTuples = -1;
DataBag bagAct = DefaultBagFactory.getInstance().newDefaultBag();
Result resAct = null;
- while((resAct = ldAct.getNext(t)).returnStatus!=POStatus.STATUS_EOP){
+ while((resAct = ldAct.getNextTuple()).returnStatus!=POStatus.STATUS_EOP){
++numActTuples;
bagAct.add(trimTuple((Tuple)resAct.result));
}
@@ -223,7 +223,7 @@ public class TestHelper {
int numExpTuples = -1;
DataBag bagExp = DefaultBagFactory.getInstance().newDefaultBag();
Result resExp = null;
- while((resExp = ldExp.getNext(t)).returnStatus!=POStatus.STATUS_EOP){
+ while((resExp = ldExp.getNextTuple()).returnStatus!=POStatus.STATUS_EOP){
++numExpTuples;
bagExp.add(trimTuple((Tuple)resExp.result));
}