Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 5453 invoked from network); 3 Apr 2007 18:23:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Apr 2007 18:23:09 -0000 Received: (qmail 78481 invoked by uid 500); 3 Apr 2007 18:23:15 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 78461 invoked by uid 500); 3 Apr 2007 18:23:15 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 78452 invoked by uid 99); 3 Apr 2007 18:23:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Apr 2007 11:23:15 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Apr 2007 11:23:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 16F7D1A9838; Tue, 3 Apr 2007 11:22:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: hadoop-commits@lucene.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070403182248.16F7D1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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