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 [4/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/TestFilter.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestFilter.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestFilter.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestFilter.java Sat May 18 01:10:18 2013
@@ -84,17 +84,17 @@ public class TestFilter {
@Test
public void testGetNextTuple() throws Exception {
pass.attachInput(t);
- Result res = pass.getNext(t);
+ Result res = pass.getNextTuple();
assertEquals(t, res.result);
fail.attachInput(t);
- res = fail.getNext(t);
+ res = fail.getNextTuple();
assertEquals(res.returnStatus, POStatus.STATUS_EOP);
for (int i = 0; i < nullFlags.length; i++) {
int count = 0;
setUpProjFil(nullFlags[i]);
while (true) {
- res = projFil.getNext(t);
+ res = projFil.getNextTuple();
if (res.returnStatus == POStatus.STATUS_EOP)
break;
count++;
@@ -191,7 +191,7 @@ public class TestFilter {
Result res;
Tuple t = tf.newTuple();
do {
- res = filter.getNext(t);
+ res = filter.getNextTuple();
if (res.returnStatus == POStatus.STATUS_OK) {
outbag.add((Tuple)res.result);
}
@@ -294,7 +294,7 @@ public class TestFilter {
Result res;
Tuple t = tf.newTuple();
do {
- res = filter.getNext(t);
+ res = filter.getNextTuple();
if (res.returnStatus == POStatus.STATUS_OK) {
outbag.add((Tuple)res.result);
}
Modified: pig/trunk/test/org/apache/pig/test/TestForEach.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestForEach.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestForEach.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestForEach.java Sat May 18 01:10:18 2013
@@ -74,8 +74,8 @@ public class TestForEach {
@Test
public void testGetNextTuple() throws ExecException, IOException {
int size = 0;
- for (Result res = fe.getNext(t); res.returnStatus != POStatus.STATUS_EOP; res = fe
- .getNext(t)) {
+ for (Result res = fe.getNextTuple(); res.returnStatus != POStatus.STATUS_EOP; res = fe
+ .getNextTuple()) {
Tuple t = (Tuple)res.result;
assertTrue(TestHelper.bagContains(projDB, t));
++size;
Modified: pig/trunk/test/org/apache/pig/test/TestGTOrEqual.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestGTOrEqual.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestGTOrEqual.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestGTOrEqual.java Sat May 18 01:10:18 2013
@@ -41,7 +41,7 @@ public class TestGTOrEqual {
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);
}
@@ -56,7 +56,7 @@ public class TestGTOrEqual {
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);
}
@@ -71,7 +71,7 @@ public class TestGTOrEqual {
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);
}
@@ -92,7 +92,7 @@ public class TestGTOrEqual {
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);
}
@@ -107,7 +107,7 @@ public class TestGTOrEqual {
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);
}
@@ -122,7 +122,7 @@ public class TestGTOrEqual {
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);
}
@@ -143,7 +143,7 @@ public class TestGTOrEqual {
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);
}
@@ -158,7 +158,7 @@ public class TestGTOrEqual {
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);
}
@@ -173,7 +173,7 @@ public class TestGTOrEqual {
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);
}
@@ -194,7 +194,7 @@ public class TestGTOrEqual {
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);
}
@@ -209,7 +209,7 @@ public class TestGTOrEqual {
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);
}
@@ -224,7 +224,7 @@ public class TestGTOrEqual {
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);
}
@@ -245,7 +245,7 @@ public class TestGTOrEqual {
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);
}
@@ -260,7 +260,7 @@ public class TestGTOrEqual {
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);
}
@@ -275,7 +275,7 @@ public class TestGTOrEqual {
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);
}
@@ -296,7 +296,7 @@ public class TestGTOrEqual {
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);
}
@@ -311,7 +311,7 @@ public class TestGTOrEqual {
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);
}
@@ -326,7 +326,7 @@ public class TestGTOrEqual {
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);
}
@@ -347,7 +347,7 @@ public class TestGTOrEqual {
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);
}
@@ -362,7 +362,7 @@ public class TestGTOrEqual {
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);
}
@@ -377,7 +377,7 @@ public class TestGTOrEqual {
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);
}
@@ -399,7 +399,7 @@ public class TestGTOrEqual {
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);
@@ -410,7 +410,7 @@ public class TestGTOrEqual {
g.setLhs(lt);
g.setRhs(rt);
- r = g.getNext(new Boolean(true));
+ r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull(r.result);
@@ -421,7 +421,7 @@ public class TestGTOrEqual {
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/TestGreaterThan.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestGreaterThan.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestGreaterThan.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestGreaterThan.java Sat May 18 01:10:18 2013
@@ -41,7 +41,7 @@ public class TestGreaterThan {
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);
}
@@ -56,7 +56,7 @@ public class TestGreaterThan {
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);
}
@@ -71,7 +71,7 @@ public class TestGreaterThan {
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);
}
@@ -92,7 +92,7 @@ public class TestGreaterThan {
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);
}
@@ -107,7 +107,7 @@ public class TestGreaterThan {
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);
}
@@ -122,7 +122,7 @@ public class TestGreaterThan {
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);
}
@@ -142,7 +142,7 @@ public class TestGreaterThan {
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);
}
@@ -157,7 +157,7 @@ public class TestGreaterThan {
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);
}
@@ -172,7 +172,7 @@ public class TestGreaterThan {
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);
}
@@ -192,7 +192,7 @@ public class TestGreaterThan {
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);
}
@@ -207,7 +207,7 @@ public class TestGreaterThan {
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);
}
@@ -222,7 +222,7 @@ public class TestGreaterThan {
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);
}
@@ -243,7 +243,7 @@ public class TestGreaterThan {
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);
}
@@ -258,7 +258,7 @@ public class TestGreaterThan {
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);
}
@@ -273,7 +273,7 @@ public class TestGreaterThan {
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);
}
@@ -293,7 +293,7 @@ public class TestGreaterThan {
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);
}
@@ -308,7 +308,7 @@ public class TestGreaterThan {
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);
}
@@ -323,7 +323,7 @@ public class TestGreaterThan {
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);
}
@@ -343,7 +343,7 @@ public class TestGreaterThan {
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);
}
@@ -358,7 +358,7 @@ public class TestGreaterThan {
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);
@@ -374,7 +374,7 @@ public class TestGreaterThan {
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);
}
@@ -396,7 +396,7 @@ public class TestGreaterThan {
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);
@@ -407,7 +407,7 @@ public class TestGreaterThan {
g.setLhs(lt);
g.setRhs(rt);
- r = g.getNext(new Boolean(true));
+ r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull(r.result);
@@ -418,7 +418,7 @@ public class TestGreaterThan {
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/TestLTOrEqual.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLTOrEqual.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLTOrEqual.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLTOrEqual.java Sat May 18 01:10:18 2013
@@ -41,7 +41,7 @@ public class TestLTOrEqual {
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);
}
@@ -56,7 +56,7 @@ public class TestLTOrEqual {
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);
}
@@ -71,7 +71,7 @@ public class TestLTOrEqual {
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);
}
@@ -91,7 +91,7 @@ public class TestLTOrEqual {
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);
}
@@ -106,7 +106,7 @@ public class TestLTOrEqual {
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);
}
@@ -121,7 +121,7 @@ public class TestLTOrEqual {
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);
}
@@ -141,7 +141,7 @@ public class TestLTOrEqual {
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);
}
@@ -156,7 +156,7 @@ public class TestLTOrEqual {
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);
}
@@ -171,7 +171,7 @@ public class TestLTOrEqual {
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);
}
@@ -191,7 +191,7 @@ public class TestLTOrEqual {
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);
}
@@ -206,7 +206,7 @@ public class TestLTOrEqual {
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);
}
@@ -221,7 +221,7 @@ public class TestLTOrEqual {
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);
}
@@ -241,7 +241,7 @@ public class TestLTOrEqual {
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);
}
@@ -256,7 +256,7 @@ public class TestLTOrEqual {
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);
}
@@ -271,7 +271,7 @@ public class TestLTOrEqual {
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);
}
@@ -291,7 +291,7 @@ public class TestLTOrEqual {
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);
}
@@ -306,7 +306,7 @@ public class TestLTOrEqual {
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);
}
@@ -321,7 +321,7 @@ public class TestLTOrEqual {
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);
}
@@ -341,7 +341,7 @@ public class TestLTOrEqual {
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);
}
@@ -356,7 +356,7 @@ public class TestLTOrEqual {
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);
}
@@ -371,7 +371,7 @@ public class TestLTOrEqual {
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);
}
@@ -393,7 +393,7 @@ public class TestLTOrEqual {
g.setLhs(lt);
g.setRhs(rt);
- Result r = g.getNext(new Boolean(true));
+ Result r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull((Boolean)r.result);
@@ -404,7 +404,7 @@ public class TestLTOrEqual {
g.setLhs(lt);
g.setRhs(rt);
- r = g.getNext(new Boolean(true));
+ r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull((Boolean)r.result);
@@ -415,7 +415,7 @@ public class TestLTOrEqual {
g.setLhs(lt);
g.setRhs(rt);
- r = g.getNext(new Boolean(true));
+ r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull((Boolean)r.result);
Modified: pig/trunk/test/org/apache/pig/test/TestLessThan.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLessThan.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLessThan.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLessThan.java Sat May 18 01:10:18 2013
@@ -41,7 +41,7 @@ public class TestLessThan {
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);
}
@@ -56,7 +56,7 @@ public class TestLessThan {
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);
}
@@ -71,7 +71,7 @@ public class TestLessThan {
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);
}
@@ -92,7 +92,7 @@ public class TestLessThan {
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);
}
@@ -107,7 +107,7 @@ public class TestLessThan {
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);
}
@@ -122,7 +122,7 @@ public class TestLessThan {
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);
}
@@ -143,7 +143,7 @@ public class TestLessThan {
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);
}
@@ -158,7 +158,7 @@ public class TestLessThan {
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);
}
@@ -173,7 +173,7 @@ public class TestLessThan {
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);
}
@@ -194,7 +194,7 @@ public class TestLessThan {
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);
}
@@ -209,7 +209,7 @@ public class TestLessThan {
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);
}
@@ -224,7 +224,7 @@ public class TestLessThan {
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);
}
@@ -245,7 +245,7 @@ public class TestLessThan {
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);
}
@@ -260,7 +260,7 @@ public class TestLessThan {
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);
}
@@ -275,7 +275,7 @@ public class TestLessThan {
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);
}
@@ -296,7 +296,7 @@ public class TestLessThan {
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);
}
@@ -311,7 +311,7 @@ public class TestLessThan {
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);
}
@@ -326,7 +326,7 @@ public class TestLessThan {
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);
}
@@ -347,7 +347,7 @@ public class TestLessThan {
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);
}
@@ -362,7 +362,7 @@ public class TestLessThan {
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);
}
@@ -377,7 +377,7 @@ public class TestLessThan {
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);
}
@@ -399,7 +399,7 @@ public class TestLessThan {
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);
@@ -410,7 +410,7 @@ public class TestLessThan {
g.setLhs(lt);
g.setRhs(rt);
- r = g.getNext(new Boolean(true));
+ r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull(r.result);
@@ -421,7 +421,7 @@ public class TestLessThan {
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/TestLoad.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLoad.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLoad.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLoad.java Sat May 18 01:10:18 2013
@@ -102,7 +102,7 @@ public class TestLoad {
}
Tuple t=null;
int size = 0;
- for(Result res = ld.getNext(t);res.returnStatus!=POStatus.STATUS_EOP;res=ld.getNext(t)){
+ for(Result res = ld.getNextTuple();res.returnStatus!=POStatus.STATUS_EOP;res=ld.getNextTuple()){
assertEquals(true, TestHelper.bagContains(inpDB, (Tuple)res.result));
++size;
}
Modified: pig/trunk/test/org/apache/pig/test/TestLocalRearrange.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLocalRearrange.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLocalRearrange.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLocalRearrange.java Sat May 18 01:10:18 2013
@@ -99,7 +99,7 @@ public class TestLocalRearrange {
public void testGetNextTuple1() throws ExecException, PlanException {
setUp1();
int size=0;
- for(Result res=lr.getNext(t);res.returnStatus!=POStatus.STATUS_EOP;res=lr.getNext(t)){
+ for(Result res=lr.getNextTuple();res.returnStatus!=POStatus.STATUS_EOP;res=lr.getNextTuple()){
Tuple t = (Tuple)res.result;
String key = (String)t.get(1);
Tuple val = (Tuple)t.get(2);
@@ -156,7 +156,7 @@ public class TestLocalRearrange {
public void testGetNextTuple2() throws ExecException, PlanException {
setUp2();
int size=0;
- for(Result res=lr.getNext(t);res.returnStatus!=POStatus.STATUS_EOP;res=lr.getNext(t)){
+ for(Result res=lr.getNextTuple();res.returnStatus!=POStatus.STATUS_EOP;res=lr.getNextTuple()){
Tuple t = (Tuple)res.result;
Tuple key = (Tuple)t.get(1);
Tuple val = (Tuple)t.get(2);
Modified: pig/trunk/test/org/apache/pig/test/TestMod.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestMod.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestMod.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestMod.java Sat May 18 01:10:18 2013
@@ -67,18 +67,18 @@ public class TestMod {
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 TestMod {
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 TestMod {
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 TestMod {
// 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 TestMod {
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 TestMod {
// 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,18 +152,18 @@ public class TestMod {
Double inpd2 = r.nextDouble();
lt.setValue(inpd1);
rt.setValue(inpd2);
- Result resd = op.getNext(inpd1);
+ Result resd = op.getNextDouble();
assertEquals(POStatus.STATUS_ERR, resd.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpd2);
- resd = op.getNext(inpd1);
+ resd = op.getNextDouble();
assertEquals(POStatus.STATUS_ERR, resd.returnStatus);
// test with null in rhs
lt.setValue(inpd1);
rt.setValue(null);
- resd = op.getNext(inpd1);
+ resd = op.getNextDouble();
assertEquals(POStatus.STATUS_ERR, resd.returnStatus);
break;
}
@@ -172,18 +172,18 @@ public class TestMod {
Float inpf2 = r.nextFloat();
lt.setValue(inpf1);
rt.setValue(inpf2);
- Result resf = op.getNext(inpf1);
+ Result resf = op.getNextFloat();
assertEquals(POStatus.STATUS_ERR, resf.returnStatus);
// test with null in lhs
lt.setValue(null);
rt.setValue(inpf2);
- resf = op.getNext(inpf1);
+ resf = op.getNextFloat();
assertEquals(POStatus.STATUS_ERR, resf.returnStatus);
// test with null in rhs
lt.setValue(inpf1);
rt.setValue(null);
- resf = op.getNext(inpf1);
+ resf = op.getNextFloat();
assertEquals(POStatus.STATUS_ERR, resf.returnStatus);
break;
}
@@ -192,19 +192,19 @@ public class TestMod {
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;
}
@@ -213,19 +213,19 @@ public class TestMod {
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;
}
@@ -234,18 +234,18 @@ public class TestMod {
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);
- resb = op.getNext(inpdt1);
+ resb = op.getNextDateTime();
assertEquals(POStatus.STATUS_ERR, resb.returnStatus);
// test with null in rhs
lt.setValue(inpdt1);
rt.setValue(null);
- resb = op.getNext(inpdt1);
+ resb = op.getNextDateTime();
assertEquals(POStatus.STATUS_ERR, resb.returnStatus);
break;
case DataType.MAP: {
@@ -253,18 +253,18 @@ public class TestMod {
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;
}
@@ -273,18 +273,18 @@ public class TestMod {
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/TestMultiply.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestMultiply.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestMultiply.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestMultiply.java Sat May 18 01:10:18 2013
@@ -67,18 +67,18 @@ public class TestMultiply {
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 TestMultiply {
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 TestMultiply {
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 TestMultiply {
// 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 TestMultiply {
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 TestMultiply {
// 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 TestMultiply {
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 TestMultiply {
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 TestMultiply {
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 TestMultiply {
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 TestMultiply {
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);
- resb = op.getNext(inpdt1);
+ resb = op.getNextDateTime();
assertEquals(POStatus.STATUS_ERR, resb.returnStatus);
// test with null in rhs
lt.setValue(inpdt1);
rt.setValue(null);
- resb = op.getNext(inpdt1);
+ resb = op.getNextDateTime();
assertEquals(POStatus.STATUS_ERR, resb.returnStatus);
break;
}
@@ -256,18 +256,18 @@ public class TestMultiply {
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;
}
@@ -276,18 +276,18 @@ public class TestMultiply {
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/TestNotEqualTo.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestNotEqualTo.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestNotEqualTo.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestNotEqualTo.java Sat May 18 01:10:18 2013
@@ -47,7 +47,7 @@ public class TestNotEqualTo {
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);
}
@@ -62,7 +62,7 @@ public class TestNotEqualTo {
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);
}
@@ -83,7 +83,7 @@ public class TestNotEqualTo {
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);
}
@@ -98,7 +98,7 @@ public class TestNotEqualTo {
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);
}
@@ -119,7 +119,7 @@ public class TestNotEqualTo {
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);
}
@@ -134,7 +134,7 @@ public class TestNotEqualTo {
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);
}
@@ -155,7 +155,7 @@ public class TestNotEqualTo {
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);
}
@@ -170,7 +170,7 @@ public class TestNotEqualTo {
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);
}
@@ -191,7 +191,7 @@ public class TestNotEqualTo {
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);
}
@@ -206,7 +206,7 @@ public class TestNotEqualTo {
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);
}
@@ -227,7 +227,7 @@ public class TestNotEqualTo {
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);
}
@@ -242,7 +242,7 @@ public class TestNotEqualTo {
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);
}
@@ -263,7 +263,7 @@ public class TestNotEqualTo {
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);
}
@@ -278,7 +278,7 @@ public class TestNotEqualTo {
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);
}
@@ -299,7 +299,7 @@ public class TestNotEqualTo {
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);
}
@@ -314,7 +314,7 @@ public class TestNotEqualTo {
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);
}
@@ -331,7 +331,7 @@ public class TestNotEqualTo {
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);
}
@@ -348,7 +348,7 @@ public class TestNotEqualTo {
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);
}
@@ -368,7 +368,7 @@ public class TestNotEqualTo {
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);
}
@@ -389,7 +389,7 @@ public class TestNotEqualTo {
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);
}
@@ -413,7 +413,7 @@ public class TestNotEqualTo {
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);
@@ -424,7 +424,7 @@ public class TestNotEqualTo {
g.setLhs(lt);
g.setRhs(rt);
- r = g.getNext(new Boolean(true));
+ r = g.getNextBoolean();
assertEquals(POStatus.STATUS_NULL, r.returnStatus);
assertNull(r.result);
@@ -435,7 +435,7 @@ public class TestNotEqualTo {
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/TestNull.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestNull.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestNull.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestNull.java Sat May 18 01:10:18 2013
@@ -51,181 +51,181 @@ public class TestNull {
switch (type) {
case DataType.BAG:
inp1 = GenRandomData.genRandSmallTupDataBag(r, 10, 100);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!res.result.equals(ret))
return false;
// set the input to null and test
lt.setValue((DataBag)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if (!res.result.equals(true))
return false;
return true;
case DataType.BOOLEAN:
inp1 = r.nextBoolean();
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((Boolean)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(true)))
return false;
return true;
case DataType.BYTEARRAY:
inp1 = GenRandomData.genRandDBA(r);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((DataByteArray)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(true)))
return false;
return true;
case DataType.CHARARRAY:
inp1 = GenRandomData.genRandString(r);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((String)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(true)))
return false;
return true;
case DataType.DOUBLE:
inp1 = r.nextDouble();
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((Double)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(true)))
return false;
return true;
case DataType.FLOAT:
inp1 = r.nextFloat();
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((Float)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if (!res.result.equals(true))
return false;
return true;
case DataType.INTEGER:
inp1 = r.nextInt();
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((Integer)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if (!res.result.equals(true))
return false;
return true;
case DataType.LONG:
inp1 = r.nextLong();
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((Long)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if (!res.result.equals(true))
return false;
return true;
case DataType.DATETIME:
inp1 = new DateTime(r.nextLong());
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((DateTime)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if (!res.result.equals(true))
return false;
return true;
case DataType.MAP:
inp1 = GenRandomData.genRandMap(r, 10);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((Map)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if (!res.result.equals(true))
return false;
return true;
case DataType.TUPLE:
inp1 = GenRandomData.genRandSmallBagTuple(r, 10, 100);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if ((Boolean)res.result != true)
return false;
lt.setValue(inp1);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
ret = (DataType.compare(inp1, null) == 0);
if (!(res.result.equals(ret)))
return false;
// set the input to null and test
lt.setValue((Tuple)null);
- res = isNullExpr.getNext((Boolean)null);
+ res = isNullExpr.getNextBoolean();
if (!res.result.equals(true))
return false;
return true;
Modified: pig/trunk/test/org/apache/pig/test/TestPOBinCond.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPOBinCond.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPOBinCond.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPOBinCond.java Sat May 18 01:10:18 2013
@@ -196,7 +196,7 @@ public class TestPOBinCond {
Boolean value = (Boolean) t.get(0);
int expected = (value.booleanValue() == true) ? 1 : 0;
Integer dummy = new Integer(0);
- Integer result = (Integer) testHelper.getOperator().getNext(dummy).result;
+ Integer result = (Integer) testHelper.getOperator().getNextInteger().result;
int actual = result.intValue();
assertEquals(expected, actual);
}
@@ -212,7 +212,7 @@ public class TestPOBinCond {
testHelper.getPlan().attachInput(t);
Integer value = (Integer) t.get(0);
int expected = (value.intValue() == 1)? 1:0 ;
- Integer result=(Integer)testHelper.getOperator().getNext(value).result;
+ Integer result=(Integer)testHelper.getOperator().getNextInteger().result;
int actual = result.intValue();
assertEquals( expected, actual );
}
@@ -229,7 +229,7 @@ public class TestPOBinCond {
Long value = (Long) t.get(0);
int expected = (value.longValue() == 1L )? 1:0 ;
Integer dummy = new Integer(0);
- Integer result=(Integer)testHelper.getOperator().getNext(dummy).result;
+ Integer result=(Integer)testHelper.getOperator().getNextInteger().result;
int actual = result.intValue();
assertEquals( expected, actual );
}
@@ -246,7 +246,7 @@ public class TestPOBinCond {
Float value = (Float) t.get(0);
int expected = (value.floatValue() == 1.0f )? 1:0 ;
Integer dummy = new Integer(0);
- Integer result=(Integer)testHelper.getOperator().getNext(dummy).result;
+ Integer result=(Integer)testHelper.getOperator().getNextInteger().result;
int actual = result.intValue();
assertEquals( expected, actual );
}
@@ -263,7 +263,7 @@ public class TestPOBinCond {
Double value = (Double) t.get(0);
int expected = (value.doubleValue() == 1.0 )? 1:0 ;
Integer dummy = new Integer(0);
- Integer result=(Integer)testHelper.getOperator().getNext(dummy).result;
+ Integer result=(Integer)testHelper.getOperator().getNextInteger().result;
int actual = result.intValue();
assertEquals( expected, actual );
}
@@ -280,7 +280,7 @@ public class TestPOBinCond {
DateTime value = (DateTime) t.get(0);
int expected = value.equals(new DateTime(1L))? 1:0 ;
Integer dummy = new Integer(0);
- Integer result=(Integer)testHelper.getOperator().getNext(dummy).result;
+ Integer result=(Integer)testHelper.getOperator().getNextInteger().result;
int actual = result.intValue();
assertEquals( expected, actual );
}
@@ -298,10 +298,9 @@ public class TestPOBinCond {
if (t.get(0) != null) {
value = (Integer) t.get(0);
- result = (Integer) testHelper.getOperator().getNext(value).result;
+ result = (Integer) testHelper.getOperator().getNextInteger().result;
} else {
- result = (Integer) testHelper.getOperator().getNext(
- (Integer) null).result;
+ result = (Integer) testHelper.getOperator().getNextInteger().result;
}
int actual;
if (value != null) {
@@ -327,7 +326,7 @@ public class TestPOBinCond {
value = (Long) t.get(0);
}
Integer dummy = new Integer(0);
- Integer result=(Integer)testHelper.getOperator().getNext(dummy).result;
+ Integer result=(Integer)testHelper.getOperator().getNextInteger().result;
int expected;
int actual;
if ( value!=null ) {
@@ -353,7 +352,7 @@ public class TestPOBinCond {
value = (Double) t.get(0);
}
Integer dummy = new Integer(0);
- Integer result=(Integer)testHelper.getOperator().getNext(dummy).result;
+ Integer result=(Integer)testHelper.getOperator().getNextInteger().result;
int expected;
int actual;
@@ -380,7 +379,7 @@ public class TestPOBinCond {
value = (DateTime) t.get(0);
}
Integer dummy = new Integer(0);
- Integer result=(Integer)testHelper.getOperator().getNext(dummy).result;
+ Integer result=(Integer)testHelper.getOperator().getNextInteger().result;
int expected;
int actual;
if ( value!=null ) {