svn commit: r765270 - in /hadoop/core/trunk: CHANGES.txt src/mapred/org/apache/hadoop/mapred/ReduceTask.java

[cdouglas]

Author: cdouglas
Date: Wed Apr 15 17:05:23 2009
New Revision: 765270

URL: http://svn.apache.org/viewvc?rev=765270&view=rev
Log:
HADOOP-5652. Fix a bug where in-memory segments are incorrectly retained in 
memory.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=765270&r1=765269&r2=765270&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Apr 15 17:05:23 2009
@@ -391,6 +391,9 @@
     HADOOP-5462. Fixed a double free bug in the task-controller
     executable. (Sreekanth Ramakrishnan via yhemanth)
 
+    HADOOP-5652. Fix a bug where in-memory segments are incorrectly retained in
+    memory. (cdouglas)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java?rev=765270&r1=765269&r2=765270&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java 
(original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java Wed 
Apr 15 17:05:23 2009
@@ -2311,8 +2311,8 @@
         memDiskSegments.clear();
         RawKeyValueIterator diskMerge = Merger.merge(
             job, fs, keyClass, valueClass, diskSegments,
-            ioSortFactor, numInMemSegments, tmpDir, comparator,
-            reporter, false, spilledRecordsCounter, null);
+            ioSortFactor, 0 == numInMemSegments ? 0 : numInMemSegments - 1,
+            tmpDir, comparator, reporter, false, spilledRecordsCounter, null);
         diskSegments.clear();
         if (0 == finalSegments.size()) {
           return diskMerge;