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 [2/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/expressionOperators/POCast.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java Sat May 18 01:10:18 2013
@@ -96,6 +96,12 @@ public class POCast extends ExpressionOp
}
}
+ private Result error() {
+ Result res = new Result();
+ res.returnStatus = POStatus.STATUS_ERR;
+ return res;
+ }
+
public void setFuncSpec(FuncSpec lf) throws IOException {
this.funcSpec = lf;
instantiateFunc();
@@ -123,25 +129,19 @@ public class POCast extends ExpressionOp
}
@Override
- public Result getNext(BigInteger v) throws ExecException {
+ public Result getNextBigInteger() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ case DataType.DATETIME:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -177,15 +177,8 @@ public class POCast extends ExpressionOp
return res;
}
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
case DataType.BOOLEAN: {
- Boolean b = null;
- Result res = in.getNext(b);
+ Result res = in.getNextBoolean();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
if ((Boolean) res.result) {
res.result = BigInteger.ONE;
@@ -196,8 +189,7 @@ public class POCast extends ExpressionOp
return res;
}
case DataType.INTEGER: {
- Integer i = null;
- Result res = in.getNext(i);
+ Result res = in.getNextInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = BigInteger.valueOf(((Integer) res.result).longValue());
}
@@ -205,8 +197,7 @@ public class POCast extends ExpressionOp
}
case DataType.DOUBLE: {
- Double d = null;
- Result res = in.getNext(d);
+ Result res = in.getNextDouble();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = BigInteger.valueOf(((Double) res.result).longValue());
}
@@ -214,8 +205,7 @@ public class POCast extends ExpressionOp
}
case DataType.LONG: {
- Long l = null;
- Result res = in.getNext(l);
+ Result res = in.getNextLong();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = BigInteger.valueOf(((Long) res.result).longValue());
}
@@ -223,8 +213,7 @@ public class POCast extends ExpressionOp
}
case DataType.FLOAT: {
- Float f = null;
- Result res = in.getNext(f);
+ Result res = in.getNextFloat();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = BigInteger.valueOf(((Float) res.result).longValue());
}
@@ -232,8 +221,7 @@ public class POCast extends ExpressionOp
}
case DataType.CHARARRAY: {
- String str = null;
- Result res = in.getNext(str);
+ Result res = in.getNextString();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new BigInteger((String)res.result);
}
@@ -241,53 +229,36 @@ public class POCast extends ExpressionOp
}
case DataType.BIGINTEGER: {
- Result res = in.getNext(v);
- return res;
+ return in.getNextBigInteger();
}
case DataType.BIGDECIMAL: {
- BigDecimal bd = null;
- Result res = in.getNext(bd);
+ Result res = in.getNextBigDecimal();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = ((BigDecimal)res.result).toBigInteger();
}
return res;
}
- case DataType.DATETIME: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
-
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(BigDecimal v) throws ExecException {
+ public Result getNextBigDecimal() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ case DataType.DATETIME:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -322,15 +293,8 @@ public class POCast extends ExpressionOp
return res;
}
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
case DataType.BOOLEAN: {
- Boolean b = null;
- Result res = in.getNext(b);
+ Result res = in.getNextBoolean();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
if ((Boolean) res.result) {
res.result = BigDecimal.ONE;
@@ -341,8 +305,7 @@ public class POCast extends ExpressionOp
return res;
}
case DataType.INTEGER: {
- Integer i = null;
- Result res = in.getNext(i);
+ Result res = in.getNextInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = BigDecimal.valueOf(((Integer) res.result).longValue());
}
@@ -350,8 +313,7 @@ public class POCast extends ExpressionOp
}
case DataType.DOUBLE: {
- Double d = null;
- Result res = in.getNext(d);
+ Result res = in.getNextDouble();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = BigDecimal.valueOf(((Double) res.result).doubleValue());
}
@@ -359,8 +321,7 @@ public class POCast extends ExpressionOp
}
case DataType.LONG: {
- Long l = null;
- Result res = in.getNext(l);
+ Result res = in.getNextLong();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = BigDecimal.valueOf(((Long) res.result).longValue());
}
@@ -368,8 +329,7 @@ public class POCast extends ExpressionOp
}
case DataType.FLOAT: {
- Float f = null;
- Result res = in.getNext(f);
+ Result res = in.getNextFloat();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = BigDecimal.valueOf(((Float) res.result).doubleValue());
}
@@ -377,8 +337,7 @@ public class POCast extends ExpressionOp
}
case DataType.CHARARRAY: {
- String str = null;
- Result res = in.getNext(str);
+ Result res = in.getNextString();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new BigDecimal((String)res.result);
}
@@ -386,64 +345,35 @@ public class POCast extends ExpressionOp
}
case DataType.BIGINTEGER: {
- BigDecimal bd = null;
- Result res = in.getNext(bd);
+ Result res = in.getNextBigInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new BigDecimal((BigInteger)res.result);
}
return res;
}
- case DataType.BIGDECIMAL: {
- Result res = in.getNext(v);
- return res;
- }
-
- case DataType.DATETIME: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BIGDECIMAL:
+ return in.getNextBigDecimal();
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(Boolean b) throws ExecException {
+ public Result getNextBoolean() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.DATETIME: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ case DataType.DATETIME:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -479,22 +409,19 @@ public class POCast extends ExpressionOp
}
case DataType.CHARARRAY: {
- String str = null;
- Result res = in.getNext(str);
+ Result res = in.getNextString();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = CastUtils.stringToBoolean((String)res.result);
}
return res;
}
- case DataType.BOOLEAN: {
- Result res = in.getNext(b);
- return res;
- }
+ case DataType.BOOLEAN:
+ return in.getNextBoolean();
case DataType.INTEGER: {
Integer i = null;
- Result res = in.getNext(i);
+ Result res = in.getNextInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Boolean.valueOf(((Integer) res.result).intValue() != 0);
}
@@ -502,8 +429,7 @@ public class POCast extends ExpressionOp
}
case DataType.LONG: {
- Long l = null;
- Result res = in.getNext(l);
+ Result res = in.getNextLong();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Boolean.valueOf(((Long) res.result).longValue() != 0L);
}
@@ -511,8 +437,7 @@ public class POCast extends ExpressionOp
}
case DataType.FLOAT: {
- Float f = null;
- Result res = in.getNext(f);
+ Result res = in.getNextFloat();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Boolean.valueOf(((Float) res.result).floatValue() != 0.0F);
}
@@ -520,8 +445,7 @@ public class POCast extends ExpressionOp
}
case DataType.DOUBLE: {
- Double d = null;
- Result res = in.getNext(d);
+ Result res = in.getNextDouble();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Boolean.valueOf(((Double) res.result).doubleValue() != 0.0);
}
@@ -530,7 +454,7 @@ public class POCast extends ExpressionOp
case DataType.BIGINTEGER: {
BigInteger bi = null;
- Result res = in.getNext(bi);
+ Result res = in.getNextBigInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Boolean.valueOf(!BigInteger.ZERO.equals((BigInteger)res.result));
}
@@ -539,7 +463,7 @@ public class POCast extends ExpressionOp
case DataType.BIGDECIMAL: {
BigDecimal bd = null;
- Result res = in.getNext(bd);
+ Result res = in.getNextBigDecimal();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Boolean.valueOf(!BigDecimal.ZERO.equals((BigDecimal)res.result));
}
@@ -548,31 +472,22 @@ public class POCast extends ExpressionOp
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(Integer i) throws ExecException {
+ public Result getNextInteger() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -607,15 +522,8 @@ public class POCast extends ExpressionOp
return res;
}
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
case DataType.BOOLEAN: {
- Boolean b = null;
- Result res = in.getNext(b);
+ Result res = in.getNextBoolean();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
if ((Boolean) res.result) {
res.result = Integer.valueOf(1);
@@ -626,13 +534,13 @@ public class POCast extends ExpressionOp
return res;
}
case DataType.INTEGER: {
- Result res = in.getNext(i);
+ Result res = in.getNextInteger();
return res;
}
case DataType.DOUBLE: {
Double d = null;
- Result res = in.getNext(d);
+ Result res = in.getNextDouble();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
// res.result = DataType.toInteger(res.result);
res.result = Integer.valueOf(((Double) res.result).intValue());
@@ -641,8 +549,7 @@ public class POCast extends ExpressionOp
}
case DataType.LONG: {
- Long l = null;
- Result res = in.getNext(l);
+ Result res = in.getNextLong();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Integer.valueOf(((Long) res.result).intValue());
}
@@ -650,8 +557,7 @@ public class POCast extends ExpressionOp
}
case DataType.FLOAT: {
- Float f = null;
- Result res = in.getNext(f);
+ Result res = in.getNextFloat();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Integer.valueOf(((Float) res.result).intValue());
}
@@ -659,8 +565,7 @@ public class POCast extends ExpressionOp
}
case DataType.DATETIME: {
- DateTime dt = null;
- Result res = in.getNext(dt);
+ Result res = in.getNextDateTime();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Integer.valueOf(Long.valueOf(((DateTime) res.result).getMillis()).intValue());
}
@@ -668,8 +573,7 @@ public class POCast extends ExpressionOp
}
case DataType.CHARARRAY: {
- String str = null;
- Result res = in.getNext(str);
+ Result res = in.getNextString();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = CastUtils.stringToInteger((String)res.result);
}
@@ -677,8 +581,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGINTEGER: {
- BigInteger bi = null;
- Result res = in.getNext(bi);
+ Result res = in.getNextBigInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Integer.valueOf(((BigInteger)res.result).intValue());
}
@@ -686,8 +589,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGDECIMAL: {
- BigDecimal bd = null;
- Result res = in.getNext(bd);
+ Result res = in.getNextBigDecimal();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Integer.valueOf(((BigDecimal)res.result).intValue());
}
@@ -696,37 +598,22 @@ public class POCast extends ExpressionOp
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(Long l) throws ExecException {
+ public Result getNextLong() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -762,8 +649,7 @@ public class POCast extends ExpressionOp
}
case DataType.BOOLEAN: {
- Boolean b = null;
- Result res = in.getNext(b);
+ Result res = in.getNextBoolean();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
if ((Boolean) res.result) {
res.result = Long.valueOf(1);
@@ -774,8 +660,7 @@ public class POCast extends ExpressionOp
return res;
}
case DataType.INTEGER: {
- Integer dummyI = null;
- Result res = in.getNext(dummyI);
+ Result res = in.getNextInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Long.valueOf(((Integer) res.result).longValue());
}
@@ -783,8 +668,7 @@ public class POCast extends ExpressionOp
}
case DataType.DOUBLE: {
- Double d = null;
- Result res = in.getNext(d);
+ Result res = in.getNextDouble();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
// res.result = DataType.toInteger(res.result);
res.result = Long.valueOf(((Double) res.result).longValue());
@@ -792,14 +676,11 @@ public class POCast extends ExpressionOp
return res;
}
- case DataType.LONG: {
- Result res = in.getNext(l);
- return res;
- }
+ case DataType.LONG:
+ return in.getNextLong();
case DataType.FLOAT: {
- Float f = null;
- Result res = in.getNext(f);
+ Result res = in.getNextFloat();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Long.valueOf(((Float) res.result).longValue());
}
@@ -807,8 +688,7 @@ public class POCast extends ExpressionOp
}
case DataType.DATETIME: {
- DateTime dt = null;
- Result res = in.getNext(dt);
+ Result res = in.getNextDateTime();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Long.valueOf(((DateTime) res.result).getMillis());
}
@@ -816,8 +696,7 @@ public class POCast extends ExpressionOp
}
case DataType.CHARARRAY: {
- String str = null;
- Result res = in.getNext(str);
+ Result res = in.getNextString();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = CastUtils.stringToLong((String)res.result);
}
@@ -825,8 +704,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGINTEGER: {
- BigInteger bi = null;
- Result res = in.getNext(bi);
+ Result res = in.getNextBigInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Long.valueOf(((BigInteger)res.result).longValue());
}
@@ -834,8 +712,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGDECIMAL: {
- BigDecimal bd = null;
- Result res = in.getNext(bd);
+ Result res = in.getNextBigDecimal();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Long.valueOf(((BigDecimal)res.result).longValue());
}
@@ -844,37 +721,22 @@ public class POCast extends ExpressionOp
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(Double d) throws ExecException {
+ public Result getNextDouble() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -910,8 +772,7 @@ public class POCast extends ExpressionOp
}
case DataType.BOOLEAN: {
- Boolean b = null;
- Result res = in.getNext(b);
+ Result res = in.getNextBoolean();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
if ((Boolean) res.result) {
res.result = new Double(1);
@@ -922,22 +783,18 @@ public class POCast extends ExpressionOp
return res;
}
case DataType.INTEGER: {
- Integer dummyI = null;
- Result res = in.getNext(dummyI);
+ Result res = in.getNextInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new Double(((Integer) res.result).doubleValue());
}
return res;
}
- case DataType.DOUBLE: {
- Result res = in.getNext(d);
- return res;
- }
+ case DataType.DOUBLE:
+ return in.getNextDouble();
case DataType.LONG: {
- Long l = null;
- Result res = in.getNext(l);
+ Result res = in.getNextLong();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new Double(((Long) res.result).doubleValue());
}
@@ -945,8 +802,7 @@ public class POCast extends ExpressionOp
}
case DataType.FLOAT: {
- Float f = null;
- Result res = in.getNext(f);
+ Result res = in.getNextFloat();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new Double(((Float) res.result).doubleValue());
}
@@ -954,8 +810,7 @@ public class POCast extends ExpressionOp
}
case DataType.DATETIME: {
- DateTime dt = null;
- Result res = in.getNext(dt);
+ Result res = in.getNextDateTime();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new Double(Long.valueOf(((DateTime) res.result).getMillis()).doubleValue());
}
@@ -963,8 +818,7 @@ public class POCast extends ExpressionOp
}
case DataType.CHARARRAY: {
- String str = null;
- Result res = in.getNext(str);
+ Result res = in.getNextString();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = CastUtils.stringToDouble((String)res.result);
}
@@ -972,8 +826,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGINTEGER: {
- BigInteger bi = null;
- Result res = in.getNext(bi);
+ Result res = in.getNextBigInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Double.valueOf(((BigInteger)res.result).doubleValue());
}
@@ -981,8 +834,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGDECIMAL: {
- BigDecimal bd = null;
- Result res = in.getNext(bd);
+ Result res = in.getNextBigDecimal();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Double.valueOf(((BigDecimal)res.result).doubleValue());
}
@@ -991,37 +843,22 @@ public class POCast extends ExpressionOp
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(Float f) throws ExecException {
+ public Result getNextFloat() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -1057,8 +894,7 @@ public class POCast extends ExpressionOp
}
case DataType.BOOLEAN: {
- Boolean b = null;
- Result res = in.getNext(b);
+ Result res = in.getNextBoolean();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
if ((Boolean) res.result) {
res.result = new Float(1);
@@ -1069,8 +905,7 @@ public class POCast extends ExpressionOp
return res;
}
case DataType.INTEGER: {
- Integer dummyI = null;
- Result res = in.getNext(dummyI);
+ Result res = in.getNextInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new Float(((Integer) res.result).floatValue());
}
@@ -1078,8 +913,7 @@ public class POCast extends ExpressionOp
}
case DataType.DOUBLE: {
- Double d = null;
- Result res = in.getNext(d);
+ Result res = in.getNextDouble();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
// res.result = DataType.toInteger(res.result);
res.result = new Float(((Double) res.result).floatValue());
@@ -1088,8 +922,7 @@ public class POCast extends ExpressionOp
}
case DataType.LONG: {
- Long l = null;
- Result res = in.getNext(l);
+ Result res = in.getNextLong();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new Float(((Long) res.result).floatValue());
}
@@ -1097,13 +930,12 @@ public class POCast extends ExpressionOp
}
case DataType.FLOAT: {
- Result res = in.getNext(f);
- return res;
+ return in.getNextFloat();
}
case DataType.DATETIME: {
DateTime dt = null;
- Result res = in.getNext(dt);
+ Result res = in.getNextDateTime();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new Float(Long.valueOf(((DateTime) res.result).getMillis()).floatValue());
}
@@ -1111,8 +943,7 @@ public class POCast extends ExpressionOp
}
case DataType.CHARARRAY: {
- String str = null;
- Result res = in.getNext(str);
+ Result res = in.getNextString();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = CastUtils.stringToFloat((String)res.result);
}
@@ -1120,8 +951,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGINTEGER: {
- BigInteger bi = null;
- Result res = in.getNext(bi);
+ Result res = in.getNextBigInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Float.valueOf(((BigInteger)res.result).floatValue());
}
@@ -1129,8 +959,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGDECIMAL: {
- BigDecimal bd = null;
- Result res = in.getNext(bd);
+ Result res = in.getNextBigDecimal();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = Float.valueOf(((BigDecimal)res.result).floatValue());
}
@@ -1139,37 +968,22 @@ public class POCast extends ExpressionOp
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(DateTime dt) throws ExecException {
+ public Result getNextDateTime() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -1206,8 +1020,7 @@ public class POCast extends ExpressionOp
}
case DataType.INTEGER: {
- Integer dummyI = null;
- Result res = in.getNext(dummyI);
+ Result res = in.getNextInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new DateTime(((Integer) res.result).longValue());
}
@@ -1215,8 +1028,7 @@ public class POCast extends ExpressionOp
}
case DataType.DOUBLE: {
- Double d = null;
- Result res = in.getNext(d);
+ Result res = in.getNextDouble();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new DateTime(((Double) res.result).longValue());
}
@@ -1224,8 +1036,7 @@ public class POCast extends ExpressionOp
}
case DataType.LONG: {
- Long l = null;
- Result res = in.getNext(l);
+ Result res = in.getNextLong();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new DateTime(((Long) res.result).longValue());
}
@@ -1233,8 +1044,7 @@ public class POCast extends ExpressionOp
}
case DataType.FLOAT: {
- Float f = null;
- Result res = in.getNext(f);
+ Result res = in.getNextFloat();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new DateTime(((Float) res.result).longValue());
}
@@ -1242,8 +1052,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGINTEGER: {
- BigInteger dummy = null;
- Result res = in.getNext(dummy);
+ Result res = in.getNextBigInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new DateTime(((BigInteger) res.result).longValue());
}
@@ -1251,22 +1060,19 @@ public class POCast extends ExpressionOp
}
case DataType.BIGDECIMAL: {
- BigDecimal dummy = null;
- Result res = in.getNext(dummy);
+ Result res = in.getNextBigDecimal();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = new DateTime(((BigDecimal) res.result).longValue());
}
return res;
}
- case DataType.DATETIME: {
- Result res = in.getNext(dt);
- return res;
- }
+ case DataType.DATETIME:
+ return in.getNextDateTime();
case DataType.CHARARRAY: {
String str = null;
- Result res = in.getNext(str);
+ Result res = in.getNextString();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
DateTimeZone dtz = ToDate.extractDateTimeZone((String) res.result);
if (dtz == null) {
@@ -1280,37 +1086,22 @@ public class POCast extends ExpressionOp
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(String str) throws ExecException {
+ public Result getNextString() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte resultType = in.getResultType();
switch (resultType) {
- case DataType.BAG: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.TUPLE: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
- case DataType.MAP: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BAG:
+ case DataType.TUPLE:
+ case DataType.MAP:
+ return error();
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
dba = (DataByteArray) res.result;
@@ -1347,8 +1138,7 @@ public class POCast extends ExpressionOp
}
case DataType.BOOLEAN: {
- Boolean b = null;
- Result res = in.getNext(b);
+ Result res = in.getNextBoolean();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
if ((Boolean) res.result) {
//res.result = "1";
@@ -1361,8 +1151,7 @@ public class POCast extends ExpressionOp
return res;
}
case DataType.INTEGER: {
- Integer dummyI = null;
- Result res = in.getNext(dummyI);
+ Result res = in.getNextInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = ((Integer) res.result).toString();
}
@@ -1370,8 +1159,7 @@ public class POCast extends ExpressionOp
}
case DataType.DOUBLE: {
- Double d = null;
- Result res = in.getNext(d);
+ Result res = in.getNextDouble();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
// res.result = DataType.toInteger(res.result);
res.result = ((Double) res.result).toString();
@@ -1380,8 +1168,7 @@ public class POCast extends ExpressionOp
}
case DataType.LONG: {
- Long l = null;
- Result res = in.getNext(l);
+ Result res = in.getNextLong();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = ((Long) res.result).toString();
}
@@ -1389,8 +1176,7 @@ public class POCast extends ExpressionOp
}
case DataType.FLOAT: {
- Float f = null;
- Result res = in.getNext(f);
+ Result res = in.getNextFloat();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = ((Float) res.result).toString();
}
@@ -1398,22 +1184,19 @@ public class POCast extends ExpressionOp
}
case DataType.DATETIME: {
- DateTime dt = null;
- Result res = in.getNext(dt);
+ Result res = in.getNextDateTime();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = ((DateTime) res.result).toString();
}
return res;
}
- case DataType.CHARARRAY: {
- Result res = in.getNext(str);
- return res;
- }
+ case DataType.CHARARRAY:
+ return in.getNextString();
case DataType.BIGINTEGER: {
BigInteger bi = null;
- Result res = in.getNext(bi);
+ Result res = in.getNextBigInteger();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = ((BigInteger)res.result).toString();
}
@@ -1421,8 +1204,7 @@ public class POCast extends ExpressionOp
}
case DataType.BIGDECIMAL: {
- BigDecimal bd = null;
- Result res = in.getNext(bd);
+ Result res = in.getNextBigDecimal();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
res.result = ((BigDecimal)res.result).toString();
}
@@ -1431,20 +1213,18 @@ public class POCast extends ExpressionOp
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte castToType = DataType.TUPLE;
Byte resultType = in.getResultType();
switch (resultType) {
case DataType.TUPLE: {
- Result res = in.getNext(t);
+ Result res = in.getNextTuple();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
res.result = convertWithSchema(res.result, fieldSchema);
@@ -1460,8 +1240,8 @@ public class POCast extends ExpressionOp
}
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
// res.result = new
// String(((DataByteArray)res.result).toString());
@@ -1509,37 +1289,20 @@ public class POCast extends ExpressionOp
}
case DataType.BAG:
-
case DataType.MAP:
-
case DataType.INTEGER:
-
case DataType.DOUBLE:
-
case DataType.LONG:
-
case DataType.FLOAT:
-
case DataType.CHARARRAY:
-
case DataType.BOOLEAN:
-
case DataType.BIGINTEGER:
-
case DataType.BIGDECIMAL:
-
- case DataType.DATETIME: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
-
+ case DataType.DATETIME:
+ return error();
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
-
+ return error();
}
@SuppressWarnings({ "unchecked", "deprecation" })
@@ -2057,14 +1820,14 @@ public class POCast extends ExpressionOp
}
@Override
- public Result getNext(DataBag bag) throws ExecException {
+ public Result getNextDataBag() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte castToType = DataType.BAG;
Byte resultType = in.getResultType();
switch (resultType) {
case DataType.BAG: {
- res = in.getNext(bag);
+ res = in.getNextDataBag();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
res.result = convertWithSchema(res.result, fieldSchema);
@@ -2080,8 +1843,8 @@ public class POCast extends ExpressionOp
}
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
// res.result = new
// String(((DataByteArray)res.result).toString());
@@ -2129,48 +1892,33 @@ public class POCast extends ExpressionOp
}
case DataType.TUPLE:
-
case DataType.MAP:
-
case DataType.INTEGER:
-
case DataType.DOUBLE:
-
case DataType.LONG:
-
case DataType.FLOAT:
-
case DataType.DATETIME:
-
case DataType.CHARARRAY:
-
case DataType.BOOLEAN:
-
case DataType.BIGINTEGER:
-
- case DataType.BIGDECIMAL: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BIGDECIMAL:
+ return error();
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@SuppressWarnings("deprecation")
@Override
- public Result getNext(Map m) throws ExecException {
+ public Result getNextMap() throws ExecException {
PhysicalOperator in = inputs.get(0);
Byte castToType = DataType.MAP;
Byte resultType = in.getResultType();
switch (resultType) {
case DataType.MAP: {
- Result res = in.getNext(m);
+ Result res = in.getNextMap();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
try {
res.result = convertWithSchema(res.result, fieldSchema);
@@ -2186,8 +1934,8 @@ public class POCast extends ExpressionOp
}
case DataType.BYTEARRAY: {
- DataByteArray dba = null;
- Result res = in.getNext(dba);
+ DataByteArray dba;
+ Result res = in.getNextDataByteArray();
if (res.returnStatus == POStatus.STATUS_OK && res.result != null) {
// res.result = new
// String(((DataByteArray)res.result).toString());
@@ -2242,43 +1990,26 @@ public class POCast extends ExpressionOp
}
case DataType.TUPLE:
-
case DataType.BAG:
-
case DataType.INTEGER:
-
case DataType.DOUBLE:
-
case DataType.LONG:
-
case DataType.DATETIME:
-
case DataType.FLOAT:
-
case DataType.CHARARRAY:
-
case DataType.BOOLEAN:
-
case DataType.BIGINTEGER:
-
- case DataType.BIGDECIMAL: {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
- }
+ case DataType.BIGDECIMAL:
+ return error();
}
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ return error();
}
@Override
- public Result getNext(DataByteArray dba) throws ExecException {
- Result res = new Result();
- res.returnStatus = POStatus.STATUS_ERR;
- return res;
+ public Result getNextDataByteArray() throws ExecException {
+ return error();
}
private void readObject(ObjectInputStream is) throws IOException,
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java Sat May 18 01:10:18 2013
@@ -58,7 +58,7 @@ public class POIsNull extends UnaryCompa
}
@Override
- public Result getNext(Boolean b) throws ExecException {
+ public Result getNextBoolean() throws ExecException {
Result res = null;
switch(operandType) {
@@ -75,7 +75,7 @@ public class POIsNull extends UnaryCompa
case DataType.MAP:
case DataType.TUPLE:
case DataType.BAG:
- res = expr.getNext(getDummy(operandType), operandType);
+ res = expr.getNext(operandType);
if(res.returnStatus == POStatus.STATUS_OK) {
if (res.result == null) {
res.result = true;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java Sat May 18 01:10:18 2013
@@ -20,14 +20,11 @@ package org.apache.pig.backend.hadoop.ex
import java.util.List;
import java.util.Map;
-import org.joda.time.DateTime;
import org.apache.pig.backend.executionengine.ExecException;
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;
-import org.apache.pig.data.DataBag;
-import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.plan.OperatorKey;
@@ -86,7 +83,7 @@ public class POMapLookUp extends Express
return res;
}
if (!isInputAttached())
- return inputs.get(0).getNext(inpValue);
+ return inputs.get(0).getNextMap();
else {
res.result = input;
res.returnStatus = POStatus.STATUS_OK;
@@ -105,57 +102,57 @@ public class POMapLookUp extends Express
}
@Override
- public Result getNext(Boolean b) throws ExecException {
+ public Result getNextBoolean() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DataBag db) throws ExecException {
+ public Result getNextDataBag() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DataByteArray ba) throws ExecException {
+ public Result getNextDataByteArray() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Double d) throws ExecException {
+ public Result getNextDouble() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Float f) throws ExecException {
+ public Result getNextFloat() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Integer i) throws ExecException {
+ public Result getNextInteger() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Long l) throws ExecException {
+ public Result getNextLong() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DateTime dt) throws ExecException {
+ public Result getNextDateTime() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Map m) throws ExecException {
+ public Result getNextMap() throws ExecException {
return getNext();
}
@Override
- public Result getNext(String s) throws ExecException {
+ public Result getNextString() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
return getNext();
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java Sat May 18 01:10:18 2013
@@ -61,8 +61,8 @@ public class PONegative extends UnaryExp
}
@Override
- public Result getNext(Double d) throws ExecException {
- Result res = expr.getNext(d);
+ public Result getNextDouble() throws ExecException {
+ Result res = expr.getNextDouble();
if(res.returnStatus == POStatus.STATUS_OK && res.result!=null) {
res.result = -1*((Double)res.result);
@@ -72,8 +72,8 @@ public class PONegative extends UnaryExp
}
@Override
- public Result getNext(Float f) throws ExecException {
- Result res = expr.getNext(f);
+ public Result getNextFloat() throws ExecException {
+ Result res = expr.getNextFloat();
if(res.returnStatus == POStatus.STATUS_OK && res.result!=null ) {
res.result = -1*((Float)res.result);
}
@@ -81,8 +81,8 @@ public class PONegative extends UnaryExp
}
@Override
- public Result getNext(Integer i) throws ExecException {
- Result res = expr.getNext(i);
+ public Result getNextInteger() throws ExecException {
+ Result res = expr.getNextInteger();
if(res.returnStatus == POStatus.STATUS_OK && res.result!=null ) {
res.result = -1*((Integer)res.result);
}
@@ -90,8 +90,8 @@ public class PONegative extends UnaryExp
}
@Override
- public Result getNext(Long l) throws ExecException {
- Result res = expr.getNext(l);
+ public Result getNextLong() throws ExecException {
+ Result res = expr.getNextLong();
if(res.returnStatus == POStatus.STATUS_OK && res.result!=null) {
res.result = -1*((Long)res.result);
}
@@ -99,8 +99,8 @@ public class PONegative extends UnaryExp
}
@Override
- public Result getNext(BigInteger bi) throws ExecException {
- Result res = expr.getNext(bi);
+ public Result getNextBigInteger() throws ExecException {
+ Result res = expr.getNextBigInteger();
if(res.returnStatus == POStatus.STATUS_OK && res.result!=null) {
res.result = ((BigInteger)res.result).negate();
}
@@ -108,8 +108,8 @@ public class PONegative extends UnaryExp
}
@Override
- public Result getNext(BigDecimal bd) throws ExecException {
- Result res = expr.getNext(bd);
+ public Result getNextBigDecimal() throws ExecException {
+ Result res = expr.getNextBigDecimal();
if(res.returnStatus == POStatus.STATUS_OK && res.result!=null) {
res.result = ((BigDecimal)res.result).negate();
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONot.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONot.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONot.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONot.java Sat May 18 01:10:18 2013
@@ -59,7 +59,7 @@ public class PONot extends UnaryComparis
}
@Override
- public Result getNext(Boolean b) throws ExecException {
+ public Result getNextBoolean() throws ExecException {
if (trueRes == null) {
trueRes = new Result();
trueRes.returnStatus = POStatus.STATUS_OK;
@@ -68,7 +68,7 @@ public class PONot extends UnaryComparis
falseRes.returnStatus = POStatus.STATUS_OK;
falseRes.result = Boolean.valueOf(false);
}
- res = expr.getNext(dummyBool);
+ res = expr.getNextBoolean();
if(res.returnStatus != POStatus.STATUS_OK || res.result == null) {
return res;
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java Sat May 18 01:10:18 2013
@@ -57,14 +57,14 @@ public class POOr extends BinaryComparis
}
@Override
- public Result getNext(Boolean b) throws ExecException {
- Result r = accumChild(null, dummyBool);
+ public Result getNextBoolean() throws ExecException {
+ Result r = accumChild(null, DataType.BOOLEAN);
if (r != null) {
return r;
}
Result left;
- left = lhs.getNext(dummyBool);
+ left = lhs.getNextBoolean();
// pass on ERROR and EOP
if(left.returnStatus != POStatus.STATUS_OK && left.returnStatus != POStatus.STATUS_NULL) {
return left;
@@ -87,7 +87,7 @@ public class POOr extends BinaryComparis
returnLeft = true;;
}
- Result right = rhs.getNext(dummyBool);
+ Result right = rhs.getNextBoolean();
if (returnLeft)
return left;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java Sat May 18 01:10:18 2013
@@ -17,14 +17,10 @@
*/
package org.apache.pig.backend.hadoop.executionengine.physicalLayer.expressionOperators;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import org.joda.time.DateTime;
import org.apache.pig.PigException;
import org.apache.pig.PigWarning;
@@ -34,7 +30,6 @@ import org.apache.pig.backend.hadoop.exe
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.data.BagFactory;
import org.apache.pig.data.DataBag;
-import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.DataType;
import org.apache.pig.data.SingleTupleBag;
import org.apache.pig.data.Tuple;
@@ -247,7 +242,7 @@ public class POProject extends Expressio
}
@Override
- public Result getNext(DataBag db) throws ExecException {
+ public Result getNextDataBag() throws ExecException {
Result res = processInputBag();
if(res.returnStatus!=POStatus.STATUS_OK)
@@ -340,59 +335,59 @@ public class POProject extends Expressio
}
@Override
- public Result getNext(DataByteArray ba) throws ExecException {
+ public Result getNextDataByteArray() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Double d) throws ExecException {
+ public Result getNextDouble() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Float f) throws ExecException {
+ public Result getNextFloat() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Integer i) throws ExecException {
+ public Result getNextInteger() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Long l) throws ExecException {
+ public Result getNextLong() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Boolean b) throws ExecException {
+ public Result getNextBoolean() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DateTime dt) throws ExecException {
+ public Result getNextDateTime() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Map m) throws ExecException {
+ public Result getNextMap() throws ExecException {
return getNext();
}
@Override
- public Result getNext(String s) throws ExecException {
+ public Result getNextString() throws ExecException {
return getNext();
}
@Override
- public Result getNext(BigInteger s) throws ExecException {
+ public Result getNextBigInteger() throws ExecException {
return getNext();
}
@Override
- public Result getNext(BigDecimal s) throws ExecException {
+ public Result getNextBigDecimal() throws ExecException {
return getNext();
}
@@ -402,7 +397,7 @@ public class POProject extends Expressio
* the entire bag.
*/
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result res = new Result();
if(!processingBagOfTuples){
Tuple inpValue = null;
@@ -490,7 +485,7 @@ public class POProject extends Expressio
else{
//done processing the bag of tuples
processingBagOfTuples = false;
- return getNext(t);
+ return getNextTuple();
}
}
@@ -592,9 +587,9 @@ public class POProject extends Expressio
if(!isInputAttached()) {
if (inputs.get(0).getResultType()==DataType.BAG)
- return inputs.get(0).getNext(dummyBag);
+ return inputs.get(0).getNextDataBag();
else
- return inputs.get(0).getNext(dummyTuple);
+ return inputs.get(0).getNextTuple();
}
else{
res.result = (DataBag)input.get(columns.get(0));
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java Sat May 18 01:10:18 2013
@@ -66,25 +66,24 @@ public class PORegexp extends BinaryComp
}
@Override
- public Result getNext(Boolean bool) throws ExecException {
- Result r = accumChild(null, dummyString);
+ public Result getNextBoolean() throws ExecException {
+ Result r = accumChild(null, DataType.CHARARRAY);
if (r != null) {
return r;
}
Result left, right;
- left = lhs.getNext(dummyString);
- right = rhs.getNext(dummyString);
+ left = lhs.getNextString();
+ right = rhs.getNextString();
- if (trueRef == null) initializeRefs();
if (left.returnStatus != POStatus.STATUS_OK || left.result == null) return left;
if (right.returnStatus != POStatus.STATUS_OK || right.result == null) return right;
if( impl.match((String)(left.result),(String)(right.result)) ) {
- left.result = trueRef;
+ left.result = Boolean.TRUE;
} else {
- left.result = falseRef;
+ left.result = Boolean.FALSE;
}
illustratorMarkup(null, left.result, (Boolean) left.result ? 0 : 1);
return left;
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java Sat May 18 01:10:18 2013
@@ -23,7 +23,6 @@ import org.apache.pig.backend.executione
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;
-import org.apache.pig.data.DataBag;
import org.apache.pig.data.DataType;
import org.apache.pig.data.NonSpillableDataBag;
import org.apache.pig.impl.plan.NodeIdGenerator;
@@ -103,7 +102,7 @@ public class PORelationToExprProject ext
}
@Override
- public Result getNext(DataBag db) throws ExecException {
+ public Result getNextDataBag() throws ExecException {
Result input = processInputBag();
// if this is called during accumulation, it is ok to have an empty bag
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java Sat May 18 01:10:18 2013
@@ -19,12 +19,8 @@ package org.apache.pig.backend.hadoop.ex
import java.io.IOException;
import java.io.ObjectInputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.util.List;
-import java.util.Map;
-import org.joda.time.DateTime;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,8 +30,6 @@ import org.apache.pig.backend.executione
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;
-import org.apache.pig.data.DataBag;
-import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.PigContext;
@@ -79,7 +73,7 @@ public class POUserComparisonFunc extend
}
@Override
- public Result getNext(Integer i) throws ExecException {
+ public Result getNextInteger() throws ExecException {
Result result = new Result();
result.result = func.compare(t1, t2);
@@ -102,62 +96,62 @@ public class POUserComparisonFunc extend
}
@Override
- public Result getNext(Boolean b) throws ExecException {
+ public Result getNextBoolean() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DataBag db) throws ExecException {
+ public Result getNextDataBag() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DataByteArray ba) throws ExecException {
+ public Result getNextDataByteArray() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Double d) throws ExecException {
+ public Result getNextDouble() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Float f) throws ExecException {
+ public Result getNextFloat() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Long l) throws ExecException {
+ public Result getNextLong() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DateTime dt) throws ExecException {
+ public Result getNextDateTime() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Map m) throws ExecException {
+ public Result getNextMap() throws ExecException {
return getNext();
}
@Override
- public Result getNext(String s) throws ExecException {
+ public Result getNextString() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Tuple in) throws ExecException {
+ public Result getNextTuple() throws ExecException {
return getNext();
}
@Override
- public Result getNext(BigInteger in) throws ExecException {
+ public Result getNextBigInteger() throws ExecException {
return getNext();
}
@Override
- public Result getNext(BigDecimal in) throws ExecException {
+ public Result getNextBigDecimal() throws ExecException {
return getNext();
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java Sat May 18 01:10:18 2013
@@ -23,10 +23,7 @@ import static org.apache.pig.PigConfigur
import java.io.IOException;
import java.io.ObjectInputStream;
import java.lang.reflect.Type;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
import org.apache.commons.logging.Log;
@@ -45,8 +42,6 @@ import org.apache.pig.backend.hadoop.exe
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.util.MonitoredUDFExecutor;
import org.apache.pig.builtin.MonitoredUDF;
-import org.apache.pig.data.DataBag;
-import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.DataType;
import org.apache.pig.data.SchemaTupleClassGenerator.GenContext;
import org.apache.pig.data.SchemaTupleFactory;
@@ -60,7 +55,6 @@ import org.apache.pig.impl.plan.Operator
import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.util.UDFContext;
import org.apache.pig.tools.pigstats.PigStatusReporter;
-import org.joda.time.DateTime;
public class POUserFunc extends ExpressionOperator {
private static final Log LOG = LogFactory.getLog(POUserFunc.class);
@@ -224,7 +218,7 @@ public class POUserFunc extends Expressi
Result temp = null;
for(PhysicalOperator op : inputs) {
- temp = op.getNext(getDummy(op.getResultType()), op.getResultType());
+ temp = op.getNext(op.getResultType());
if(temp.returnStatus!=POStatus.STATUS_OK) {
return temp;
}
@@ -371,70 +365,70 @@ public class POUserFunc extends Expressi
}
@Override
- public Result getNext(Tuple tIn) throws ExecException {
+ public Result getNextTuple() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DataBag db) throws ExecException {
+ public Result getNextDataBag() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Integer i) throws ExecException {
+ public Result getNextInteger() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Boolean b) throws ExecException {
+ public Result getNextBoolean() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DataByteArray ba) throws ExecException {
+ public Result getNextDataByteArray() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Double d) throws ExecException {
+ public Result getNextDouble() throws ExecException {
return getNext();
}
@Override
- public Result getNext(BigInteger bi) throws ExecException {
+ public Result getNextBigInteger() throws ExecException {
return getNext();
}
@Override
- public Result getNext(BigDecimal bd) throws ExecException {
+ public Result getNextBigDecimal() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Float f) throws ExecException {
+ public Result getNextFloat() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Long l) throws ExecException {
+ public Result getNextLong() throws ExecException {
return getNext();
}
@Override
- public Result getNext(DateTime dt) throws ExecException {
+ public Result getNextDateTime() throws ExecException {
return getNext();
}
@Override
- public Result getNext(Map m) throws ExecException {
+ public Result getNextMap() throws ExecException {
return getNext();
}
@Override
- public Result getNext(String s) throws ExecException {
+ public Result getNextString() throws ExecException {
return getNext();
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java Sat May 18 01:10:18 2013
@@ -58,82 +58,79 @@ public class Subtract extends BinaryExpr
* This method is used to invoke the appropriate subtraction method, as Java does not provide generic
* dispatch for it.
*/
- @SuppressWarnings("unchecked")
- protected <T extends Number> T subtract(T a, T b, byte dataType) throws ExecException {
+ protected Number subtract(Number a, Number b, byte dataType) throws ExecException {
switch(dataType) {
case DataType.DOUBLE:
- return (T) Double.valueOf((Double) a - (Double) b);
+ return Double.valueOf((Double) a - (Double) b);
case DataType.INTEGER:
- return (T) Integer.valueOf((Integer) a - (Integer) b);
+ return Integer.valueOf((Integer) a - (Integer) b);
case DataType.LONG:
- return (T) Long.valueOf((Long) a - (Long) b);
+ return Long.valueOf((Long) a - (Long) b);
case DataType.FLOAT:
- return (T) Float.valueOf((Float) a - (Float) b);
+ return Float.valueOf((Float) a - (Float) b);
case DataType.BIGINTEGER:
- return (T) ((BigInteger) a).subtract((BigInteger) b);
+ return ((BigInteger) a).subtract((BigInteger) b);
case DataType.BIGDECIMAL:
- return (T) ((BigDecimal) a).subtract((BigDecimal) b);
+ return ((BigDecimal) a).subtract((BigDecimal) b);
default:
throw new ExecException("called on unsupported Number class " + DataType.findTypeName(dataType));
}
}
- @SuppressWarnings("unchecked")
- protected <T extends Number> Result genericGetNext(T number, byte dataType) throws ExecException {
- Result r = accumChild(null, number, dataType);
+ protected Result genericGetNext(byte dataType) throws ExecException {
+ Result r = accumChild(null, dataType);
if (r != null) {
return r;
}
byte status;
Result res;
- T left = null, right = null;
- res = lhs.getNext(left, dataType);
+ res = lhs.getNext(dataType);
status = res.returnStatus;
if(status != POStatus.STATUS_OK || res.result == null) {
return res;
}
- left = (T) res.result;
+ Number left = (Number) res.result;
- res = rhs.getNext(right, dataType);
+ res = rhs.getNext(dataType);
status = res.returnStatus;
if(status != POStatus.STATUS_OK || res.result == null) {
return res;
}
- right = (T) res.result;
+ Number right = (Number) res.result;
res.result = subtract(left, right, dataType);
return res;
}
@Override
- public Result getNext(Double d) throws ExecException {
- return genericGetNext(d, DataType.DOUBLE);
+ public Result getNextDouble() throws ExecException {
+ return genericGetNext(DataType.DOUBLE);
}
@Override
- public Result getNext(Float f) throws ExecException {
- return genericGetNext(f, DataType.FLOAT);
+ public Result getNextFloat() throws ExecException {
+ return genericGetNext(DataType.FLOAT);
}
@Override
- public Result getNext(Integer i) throws ExecException {
- return genericGetNext(i, DataType.INTEGER);
+ public Result getNextInteger() throws ExecException {
+ return genericGetNext(DataType.INTEGER);
}
@Override
- public Result getNext(Long l) throws ExecException {
- return genericGetNext(l, DataType.LONG);
+ public Result getNextLong() throws ExecException {
+ return genericGetNext(DataType.LONG);
}
@Override
- public Result getNext(BigInteger bi) throws ExecException {
- return genericGetNext(bi, DataType.BIGINTEGER);
+ public Result getNextBigInteger() throws ExecException {
+ return genericGetNext(DataType.BIGINTEGER);
}
@Override
- public Result getNext(BigDecimal bd) throws ExecException {
- return genericGetNext(bd, DataType.BIGDECIMAL);
+ public Result getNextBigDecimal() throws ExecException {
+ return genericGetNext(DataType.BIGDECIMAL);
}
@Override
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java Sat May 18 01:10:18 2013
@@ -125,7 +125,7 @@ public class POCollectedGroup extends Ph
@SuppressWarnings("unchecked")
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
// Since the output is buffered, we need to flush the last
// set of records when the close method is called by mapper.
@@ -161,7 +161,7 @@ public class POCollectedGroup extends Ph
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/POCombinerPackage.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCombinerPackage.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCombinerPackage.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCombinerPackage.java Sat May 18 01:10:18 2013
@@ -126,7 +126,7 @@ public class POCombinerPackage extends P
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
int keyField = -1;
//Create numInputs bags
Object[] fields = new Object[mBags.length];
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java Sat May 18 01:10:18 2013
@@ -127,7 +127,7 @@ public class POCounter extends PhysicalO
}
@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/POCross.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCross.java?rev=1484037&r1=1484036&r2=1484037&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCross.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCross.java Sat May 18 01:10:18 2013
@@ -109,7 +109,7 @@ public class POCross extends PhysicalOpe
}
@Override
- public Result getNext(Tuple t) throws ExecException {
+ public Result getNextTuple() throws ExecException {
Result res = new Result();
int noItems = inputs.size();
if (inputBags == null) {
@@ -137,8 +137,8 @@ public class POCross extends PhysicalOpe
// if one bag is empty, there doesn't exist non-null cross product.
// simply clear all the input tuples of the first bag and finish.
int index = inputs.size() - 1;
- for (Result resOfLastBag = inputs.get(index).getNext(dummyTuple); resOfLastBag.returnStatus !=
- POStatus.STATUS_EOP; resOfLastBag = inputs.get(index).getNext(dummyTuple));
+ for (Result resOfLastBag = inputs.get(index).getNextTuple(); resOfLastBag.returnStatus !=
+ POStatus.STATUS_EOP; resOfLastBag = inputs.get(index).getNextTuple());
res.returnStatus = POStatus.STATUS_EOP;
clearMemory();
return res;
@@ -199,8 +199,8 @@ public class POCross extends PhysicalOpe
PhysicalOperator op = inputs.get(i);
DataBag bag = BagFactory.getInstance().newDefaultBag();
inputBags[count] = bag;
- for (Result res = op.getNext(dummyTuple); res.returnStatus != POStatus.STATUS_EOP; res = op
- .getNext(dummyTuple)) {
+ for (Result res = op.getNextTuple(); res.returnStatus != POStatus.STATUS_EOP; res = op
+ .getNextTuple()) {
if (res.returnStatus == POStatus.STATUS_NULL)
continue;
if (res.returnStatus == POStatus.STATUS_ERR)
@@ -230,8 +230,8 @@ public class POCross extends PhysicalOpe
private boolean loadLastBag() throws ExecException {
Result resOfLastBag = null;
int index = inputs.size() - 1;
- for (resOfLastBag = inputs.get(index).getNext(dummyTuple); resOfLastBag.returnStatus ==
- POStatus.STATUS_NULL; inputs.get(index).getNext(dummyTuple));
+ for (resOfLastBag = inputs.get(index).getNextTuple(); resOfLastBag.returnStatus ==
+ POStatus.STATUS_NULL; inputs.get(index).getNextTuple());
switch (resOfLastBag.returnStatus) {
case POStatus.STATUS_EOP:
return false;