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:31:21 UTC

svn commit: r1638018 - /pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java

Author: daijy
Date: Tue Nov 11 02:31:20 2014
New Revision: 1638018

URL: http://svn.apache.org/r1638018
Log:
Revert PIG-4314: BigData_5 hang on some machine (PIG-4314-2.patch)

Modified:
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java?rev=1638018&r1=1638017&r2=1638018&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java Tue Nov 11 02:31:20 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) {