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/11/11 03:30:52 UTC
svn commit: r1638017 -
/pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java
Author: daijy
Date: Tue Nov 11 02:30:51 2014
New Revision: 1638017
URL: http://svn.apache.org/r1638017
Log:
Revert PIG-4314: BigData_5 hang on some machine (PIG-4314-2.patch)
Modified:
pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java
Modified: pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java?rev=1638017&r1=1638016&r2=1638017&view=diff
==============================================================================
--- pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java (original)
+++ pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java Tue Nov 11 02:30:51 2014
@@ -202,14 +202,12 @@ public class POPartialAgg extends Physic
// SpillableMemoryManager requested a spill to reduce memory
// consumption. See if we can avoid it.
aggregateBothLevels(false, false);
- // TODO Need to see if we can optimize here (See PIG-4314)
- // if (shouldSpill()) {
- // startSpill(false);
- // } else {
- // LOG.info("Avoided emitting records during spill memory call.");
- // doContingentSpill = false;
- // }
- startSpill(false);
+ if (shouldSpill()) {
+ startSpill(false);
+ } else {
+ LOG.info("Avoided emitting records during spill memory call.");
+ doContingentSpill = false;
+ }
}
}
if (doSpill) {