You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2008/11/25 11:33:32 UTC

svn commit: r720461 - in /hadoop/core/branches/branch-0.19: CHANGES.txt src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java

Author: cdouglas
Date: Tue Nov 25 02:33:31 2008
New Revision: 720461

URL: http://svn.apache.org/viewvc?rev=720461&view=rev
Log:
HADOOP-4697. Fix getBlockLocations in KosmosFileSystem to handle multiple
blocks correctly. Contributed by Sriram Rao.

Modified:
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=720461&r1=720460&r2=720461&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Tue Nov 25 02:33:31 2008
@@ -1,5 +1,12 @@
 Hadoop Change Log
 
+Release 0.19.1 - Unreleased
+
+  BUG FIXES
+
+    HADOOP-4697. Fix getBlockLocations in KosmosFileSystem to handle multiple
+    blocks correctly. (Sriram Rao via cdouglas)
+
 Release 0.19.0 - 2008-11-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java?rev=720461&r1=720460&r2=720461&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java (original)
+++ hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java Tue Nov 25 02:33:31 2008
@@ -294,9 +294,11 @@
       BlockLocation[] result = new BlockLocation[hints.length];
       long blockSize = getDefaultBlockSize();
       long length = len;
+      long blockStart = start;
       for(int i=0; i < result.length; ++i) {
-        result[i] = new BlockLocation(null, hints[i], start, 
+        result[i] = new BlockLocation(null, hints[i], blockStart, 
                                       length < blockSize ? length : blockSize);
+        blockStart += blockSize;
         length -= blockSize;
       }
       return result;