hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r525233 - in /lucene/hadoop/branches/branch-0.12: CHANGES.txt src/java/org/apache/hadoop/dfs/DistributedFileSystem.java src/java/org/apache/hadoop/fs/FsShell.java
Date Tue, 03 Apr 2007 18:22:47 GMT
Author: cutting
Date: Tue Apr  3 11:22:47 2007
New Revision: 525233

URL: http://svn.apache.org/viewvc?view=rev&rev=525233
Log:
HADOOP-1192.  Merge -r 525228:525229 from trunk to 0.12 branch.

Modified:
    lucene/hadoop/branches/branch-0.12/CHANGES.txt
    lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/dfs/DistributedFileSystem.java
    lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/fs/FsShell.java

Modified: lucene/hadoop/branches/branch-0.12/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.12/CHANGES.txt?view=diff&rev=525233&r1=525232&r2=525233
==============================================================================
--- lucene/hadoop/branches/branch-0.12/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.12/CHANGES.txt Tue Apr  3 11:22:47 2007
@@ -19,6 +19,10 @@
  5. HADOOP-1191.  Fix map tasks to wait until sort progress thread has
     stopped before reporting the task done.  (Devaraj Das via cutting)
 
+ 6. HADOOP-1192.  Fix an integer overflow bug in FSShell's 'dus'
+    command and a performance problem in HDFS's implementation of it.
+    (Hairong Kuang via cutting)
+
 
 Release 0.12.2 - 2007-23-17
 

Modified: lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/dfs/DistributedFileSystem.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/dfs/DistributedFileSystem.java?view=diff&rev=525233&r1=525232&r2=525233
==============================================================================
--- lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/dfs/DistributedFileSystem.java
(original)
+++ lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/dfs/DistributedFileSystem.java
Tue Apr  3 11:22:47 2007
@@ -361,6 +361,11 @@
       super( new RawDistributedFileSystem(namenode, conf) );
     }
 
+    @Override
+    public long getContentLength(Path f) throws IOException {
+      return fs.getContentLength(f);
+    }
+
     /** Return the total raw capacity of the filesystem, disregarding
      * replication .*/
     public long getRawCapacity() throws IOException{

Modified: lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/fs/FsShell.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/fs/FsShell.java?view=diff&rev=525233&r1=525232&r2=525233
==============================================================================
--- lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/fs/FsShell.java (original)
+++ lucene/hadoop/branches/branch-0.12/src/java/org/apache/hadoop/fs/FsShell.java Tue Apr
 3 11:22:47 2007
@@ -375,7 +375,7 @@
       for(int i=0; i<paths.length; i++) {
         Path items[] = fs.listPaths( paths[i] );
         if (items != null) {
-          int totalSize=0;
+          long totalSize=0;
           for(int j=0; j<items.length; j++) {
             totalSize += fs.getContentLength(items[j]);
           }



Mime
View raw message