HADOOP-1128. Fix missing progress information in map tasks. Contributed by Espen Amble Kolstad, Andrzej Bialecki, and Owen O'Malley.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@519425 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -69,6 +69,10 @@ Trunk (unreleased changes)
 20. HADOOP-1096.  Rename InputArchive and OutputArchive and
     make them public. (Milind Bhandarkar via tomwhite)
 
+21. HADOOP-1128.  Fix missing progress information in map tasks.
+    (Espen Amble Kolstad, Andrzej Bialecki, and Owen O'Malley
+    via tomwhite)
+
 
 Release 0.12.0 - 2007-03-02
 

src/java/org/apache/hadoop/mapred/LineRecordReader.java

@@ -113,7 +113,7 @@ public class LineRecordReader implements RecordReader {
     if (start == end) {
       return 0.0f;
     } else {
-      return (pos - start) / (end - start);
+      return Math.min(1.0f, (pos - start) / (float)(end - start));
     }
   }
   

src/java/org/apache/hadoop/mapred/SequenceFileRecordReader.java

@@ -44,7 +44,8 @@ public class SequenceFileRecordReader implements RecordReader {
     if (split.getStart() > in.getPosition())
       in.sync(split.getStart());                  // sync to start
 
-    more = in.getPosition() < end;
+    this.start = in.getPosition();
+    more = start < end;
   }
 
 
@@ -104,7 +105,7 @@ public class SequenceFileRecordReader implements RecordReader {
     if (end == start) {
       return 0.0f;
     } else {
-      return (in.getPosition() - start) / (end - start);
+      return Math.min(1.0f, (in.getPosition() - start) / (float)(end - start));
     }
   }