Author: daijy
Date: Tue Mar 3 20:31:36 2015
New Revision: 1663782
URL: http://svn.apache.org/r1663782
Log:
Rollback PIG-4412: Race condition in writing multiple outputs from STREAM op
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1663782&r1=1663781&r2=1663782&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Mar 3 20:31:36 2015
@@ -62,8 +62,6 @@ PIG-4437: Fix tez unit test failure Test
PIG-4432: Built-in VALUELIST and VALUESET UDFs do not preserve the schema when
the map value type is
a complex type (erwaman via daijy)
-PIG-4412: Race condition in writing multiple outputs from STREAM op (jwills
via daijy)
-
PIG-4408: Merge join should support replicated join as a predecessor (bridiver
via daijy)
PIG-4389: Flag to run selected test suites in e2e tests (daijy)
Modified:
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java?rev=1663782&r1=1663781&r2=1663782&view=diff
==============================================================================
---
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
(original)
+++
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
Tue Mar 3 20:31:36 2015
@@ -165,11 +165,8 @@ public class POStream extends PhysicalOp
// map or reduce. So once we send this EOP down,
// getNext() in POStream should never be called. So
// we don't need to set any flag noting we saw all output
- // from binary. We also need to be sure to finish the
- // executable manager's execution so any side
- // output files are correctly moved to HDFS.
+ // from binary
r = EOP_RESULT;
- finish();
} else if (r.returnStatus == POStatus.STATUS_OK)
illustratorMarkup(r.result, r.result, 0);
return(r);
@@ -204,11 +201,8 @@ public class POStream extends PhysicalOp
// map or reduce. So once we send this EOP down,
// getNext() in POStream should never be called. So
// we don't need to set any flag noting we saw all
output
- // from binary. We also need to be sure to shutdown
- // the executable manager so any side outputs are
- // properly moved to HDFS.
+ // from binary
r = EOP_RESULT;
- finish();
}
}
@@ -223,7 +217,6 @@ public class POStream extends PhysicalOp
// should never be called. So we don't need to set any
// flag noting we saw all output from binary
r = EOP_RESULT;
- finish();
} else if (r.returnStatus == POStatus.STATUS_OK)
illustratorMarkup(r.result, r.result, 0);
return r;
@@ -239,7 +232,6 @@ public class POStream extends PhysicalOp
// for future calls
r = EOP_RESULT;
allOutputFromBinaryProcessed = true;
- finish();
} else if (r.returnStatus == POStatus.STATUS_OK)
illustratorMarkup(r.result, r.result, 0);
return r;
@@ -359,10 +351,7 @@ public class POStream extends PhysicalOp
*
*/
public void finish() throws IOException {
- if (executableManager != null) {
- executableManager.close();
- executableManager = null;
- }
+ executableManager.close();
}
/**
