svn commit: r1031743 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/io/MapFile.java

[tomwhite]

Author: tomwhite
Date: Fri Nov  5 19:36:06 2010
New Revision: 1031743

URL: http://svn.apache.org/viewvc?rev=1031743&view=rev
Log:
HADOOP-6758. MapFile.fix does not allow index interval definition. Contributed 
by Gianmarco De Francisci Morales.

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1031743&r1=1031742&r2=1031743&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Fri Nov  5 19:36:06 2010
@@ -303,6 +303,9 @@ Trunk (unreleased changes)
     HADOOP-6975.  Integer overflow in S3InputStream for blocks > 2GB.
     (Patrick Kling via tomwhite)
 
+    HADOOP-6758. MapFile.fix does not allow index interval definition.
+    (Gianmarco De Francisci Morales via tomwhite)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java?rev=1031743&r1=1031742&r2=1031743&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java Fri Nov  5 
19:36:06 2010
@@ -771,7 +771,7 @@ public class MapFile {
     String dr = (dryrun ? "[DRY RUN ] " : "");
     Path data = new Path(dir, DATA_FILE_NAME);
     Path index = new Path(dir, INDEX_FILE_NAME);
-    int indexInterval = 128;
+    int indexInterval = conf.getInt(Writer.INDEX_INTERVAL, 128);
     if (!fs.exists(data)) {
       // there's nothing we can do to fix this!
       throw new Exception(dr + "Missing data file in " + dir + ", impossible 
to fix this.");