svn commit: r720386 - in /hadoop/core/trunk: CHANGES.txt src/core/org/apache/hadoop/fs/FileSystem.java src/core/org/apache/hadoop/fs/FsShell.java

[cdouglas]

Author: cdouglas
Date: Mon Nov 24 18:54:38 2008
New Revision: 720386

URL: http://svn.apache.org/viewvc?rev=720386&view=rev
Log:
HADOOP-4339. Remove redundant calls from FileSystem/FsShell when
generating/processing ContentSummary. Contributed by David Phillips.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=720386&r1=720385&r2=720386&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Nov 24 18:54:38 2008
@@ -129,6 +129,9 @@
     HADOOP-4666. Launch reduces only after a few maps have run in the 
     Fair Scheduler. (Matei Zaharia via johan)    
 
+    HADOOP-4339. Remove redundant calls from FileSystem/FsShell when
+    generating/processing ContentSummary. (David Phillips via cdouglas)
+
   OPTIMIZATIONS
 
     HADOOP-3293. Fixes FileInputFormat to do provide locations for splits

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java?rev=720386&r1=720385&r2=720386&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java Mon Nov 24 
18:54:38 2008
@@ -693,7 +693,8 @@
     // f is a directory
     long[] summary = {0, 0, 1};
     for(FileStatus s : listStatus(f)) {
-      ContentSummary c = getContentSummary(s.getPath());
+      ContentSummary c = s.isDir() ? getContentSummary(s.getPath()) :
+                                     new ContentSummary(s.getLen(), 1, 0);
       summary[0] += c.getLength();
       summary[1] += c.getFileCount();
       summary[2] += c.getDirectoryCount();

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java?rev=720386&r1=720385&r2=720386&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java Mon Nov 24 
18:54:38 2008
@@ -654,14 +654,16 @@
       System.out.println("Found " + items.length + " items");
       int maxLength = 10;
       
+      long length[] = new long[items.length];
       for (int i = 0; i < items.length; i++) {
-        String size = String.valueOf(srcFs.getContentSummary(items[i]
-                                                                   
.getPath()).getLength());
-        if (size.length() > maxLength) maxLength = size.length();
+        length[i] = items[i].isDir() ?
+          srcFs.getContentSummary(items[i].getPath()).getLength() :
+          items[i].getLen();
+        int len = String.valueOf(length[i]).length();
+        if (len > maxLength) maxLength = len;
       }
       for(int i = 0; i < items.length; i++) {
-        System.out.printf("%-"+ (maxLength + BORDER) +"d", 
-            srcFs.getContentSummary(items[i].getPath()).getLength());
+        System.out.printf("%-"+ (maxLength + BORDER) +"d", length[i]);
         System.out.println(items[i].getPath());
       }
     }