You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2014/02/27 07:39:59 UTC
svn commit: r1572448 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/PigWarning.java
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java
Author: cheolsoo
Date: Thu Feb 27 06:39:58 2014
New Revision: 1572448
URL: http://svn.apache.org/r1572448
Log:
PIG-3679: e2e StreamingPythonUDFs_10 fails in trunk (cheolsoo)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/PigWarning.java
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1572448&r1=1572447&r2=1572448&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Feb 27 06:39:58 2014
@@ -91,6 +91,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-3679: e2e StreamingPythonUDFs_10 fails in trunk (cheolsoo)
+
PIG-3776: Conflicting versions of jline is present in trunk (cheolsoo)
PIG-3674: Fix TestAccumuloPigCluster on Hadoop 2 (elserj via daijy)
Modified: pig/trunk/src/org/apache/pig/PigWarning.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/PigWarning.java?rev=1572448&r1=1572447&r2=1572448&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/PigWarning.java (original)
+++ pig/trunk/src/org/apache/pig/PigWarning.java Thu Feb 27 06:39:58 2014
@@ -67,6 +67,7 @@ public enum PigWarning {
NULL_COUNTER_COUNT,
DELETE_FAILED,
PROJECTION_INVALID_RANGE,
- NO_LOAD_FUNCTION_FOR_CASTING_BYTEARRAY
+ NO_LOAD_FUNCTION_FOR_CASTING_BYTEARRAY,
+ SKIP_UDF_CALL_FOR_NULL
;
}
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=1572448&r1=1572447&r2=1572448&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 Thu Feb 27 06:39:58 2014
@@ -186,9 +186,7 @@ public class POUserFunc extends Expressi
}
Result res = new Result();
- Tuple inpValue = null;
if (input == null && (inputs == null || inputs.size()==0)) {
-// log.warn("No inputs found. Signaling End of Processing.");
res.returnStatus = POStatus.STATUS_EOP;
return res;
}
@@ -269,7 +267,6 @@ public class POUserFunc extends Expressi
private Result getNext() throws ExecException {
Result result = processInput();
- String errMsg = "";
long startNanos = 0;
boolean timeThis = doTiming && (numInvocations++ % TIMING_FREQ == 0);
if (timeThis) {
@@ -296,10 +293,10 @@ public class POUserFunc extends Expressi
result.result = null;
isAccumulationDone = false;
} else {
- ((Accumulator)func).accumulate((Tuple)result.result);
- result.returnStatus = POStatus.STATUS_BATCH_OK;
- result.result = null;
- isAccumulationDone = false;
+ ((Accumulator)func).accumulate((Tuple)result.result);
+ result.returnStatus = POStatus.STATUS_BATCH_OK;
+ result.result = null;
+ isAccumulationDone = false;
}
}else{
if(isAccumulationDone){
@@ -323,7 +320,7 @@ public class POUserFunc extends Expressi
if (executor != null) {
result.result = executor.monitorExec((Tuple) result.result);
} else {
- result.result = func.exec((Tuple) result.result);
+ result.result = func.exec((Tuple) result.result);
}
}
}
@@ -355,7 +352,7 @@ public class POUserFunc extends Expressi
} catch (IndexOutOfBoundsException ie) {
int errCode = 2078;
String msg = "Caught error from UDF: " + funcSpec.getClassName() +
- ", Out of bounds access [" + ie.getMessage() + "]";
+ ", Out of bounds access [" + ie.getMessage() + "]";
throw new ExecException(msg, errCode, PigException.BUG, ie);
}
}