svn commit: r543623 - in /lucene/hadoop/branches/branch-0.13: CHANGES.txt src/java/org/apache/hadoop/mapred/TaskTracker.java

[cutting]

Author: cutting
Date: Fri Jun  1 14:26:03 2007
New Revision: 543623

URL: http://svn.apache.org/viewvc?view=rev&rev=543623
Log:
Merge -r 543621:543622 from trunk to 0.13 branch.  Fixes: HADOOP-1452.

Modified:
    lucene/hadoop/branches/branch-0.13/CHANGES.txt
    
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java

Modified: lucene/hadoop/branches/branch-0.13/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/CHANGES.txt?view=diff&rev=543623&r1=543622&r2=543623
==============================================================================
--- lucene/hadoop/branches/branch-0.13/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.13/CHANGES.txt Fri Jun  1 14:26:03 2007
@@ -440,6 +440,10 @@
      only while sorting, so that stuck maps are correctly terminated.
      (Devaraj Das and Arun C Murthy via cutting)
 
+132. HADOOP-1452.  Change TaskTracker.MapOutputServlet.doGet.totalRead
+     to a long, permitting map outputs to exceed 2^31 bytes.
+     (omalley via cutting)
+
 
 Release 0.12.3 - 2007-04-06
 

Modified: 
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java?view=diff&rev=543623&r1=543622&r2=543623
==============================================================================
--- 
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java
 Fri Jun  1 14:26:03 2007
@@ -1930,7 +1930,7 @@
         //seek to the correct offset for the reduce
         mapOutputIn.seek(startOffset);
           
-        int totalRead = 0;
+        long totalRead = 0;
         int len = mapOutputIn.read(buffer, 0,
                                    partLength < MAX_BYTES_TO_READ 
                                    ? (int)partLength : MAX_BYTES_TO_READ);