Author: acmurthy
Date: Tue Jul 29 13:06:09 2008
New Revision: 680822

URL: http://svn.apache.org/viewvc?rev=680822&view=rev
Log:
Merge -r 679878:679879 from trunk to branch-0.18 to fix HADOOP-3827

Added:
    
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/mapred/TestCompressedEmptyMapOutputs.java
      - copied unchanged from r679879, 
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCompressedEmptyMapOutputs.java
Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/MapTask.java

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=680822&r1=680821&r2=680822&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Tue Jul 29 13:06:09 2008
@@ -770,6 +770,8 @@
 
     HADOOP-3724. Fixes two problems related to storing and recovering lease
     in the fsimage. (dhruba)
+    
+    HADOOP-3827.  Fixed compression of empty map-outputs. (acmurthy) 
 
 Release 0.17.2 - Unreleased
 

Modified: 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/MapTask.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/MapTask.java?rev=680822&r1=680821&r2=680822&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/MapTask.java
 (original)
+++ 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/MapTask.java
 Tue Jul 29 13:06:09 2008
@@ -1008,7 +1008,7 @@
         for (int i = 0; i < partitions; i++) {
           long segmentStart = finalOut.getPos();
           Writer<K, V> writer = new Writer<K, V>(job, finalOut, 
-                                                 keyClass, valClass, null);
+                                                 keyClass, valClass, codec);
           writer.close();
           writeIndexRecord(finalIndexOut, finalOut, segmentStart, writer);
         }


Reply via email to