You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/06/20 20:33:23 UTC
svn commit: r1604234 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java
Author: daijy
Date: Fri Jun 20 18:33:22 2014
New Revision: 1604234
URL: http://svn.apache.org/r1604234
Log:
PIG-4022: Fix tez e2e test SkewedJoin_6
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1604234&r1=1604233&r2=1604234&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Jun 20 18:33:22 2014
@@ -38,6 +38,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4022: Fix tez e2e test SkewedJoin_6 (daijy)
+
PIG-4001: POPartialAgg aggregates too aggressively when multiple values aggregated (tmwoodruff via cheolsoo)
PIG-4027: Always check for latest Tez snapshot dependencies (lbendig via cheolsoo)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java?rev=1604234&r1=1604233&r2=1604234&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java Fri Jun 20 18:33:22 2014
@@ -134,13 +134,14 @@ public class POPoissonSample extends Phy
res = processInput();
if (res.returnStatus == POStatus.STATUS_NULL) {
continue;
- } else if (res.returnStatus == POStatus.STATUS_EOP
- || res.returnStatus == POStatus.STATUS_ERR) {
+ } else if (res.returnStatus == POStatus.STATUS_EOP) {
if (this.parentPlan.endOfAllInput) {
return createNumRowTuple((Tuple)newSample.result);
} else {
- continue;
+ return res;
}
+ } else if (res.returnStatus == POStatus.STATUS_ERR){
+ return res;
}
rowNum++;
}
@@ -150,13 +151,14 @@ public class POPoissonSample extends Phy
res = processInput();
if (res.returnStatus == POStatus.STATUS_NULL) {
continue;
- } else if (res.returnStatus == POStatus.STATUS_EOP
- || res.returnStatus == POStatus.STATUS_ERR) {
+ } else if (res.returnStatus == POStatus.STATUS_EOP) {
if (this.parentPlan.endOfAllInput) {
return createNumRowTuple((Tuple)newSample.result);
} else {
- continue;
+ return res;
}
+ } else if (res.returnStatus == POStatus.STATUS_ERR){
+ return res;
}
if (res.result == null) {