Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 41885 invoked from network); 11 Mar 2011 23:42:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Mar 2011 23:42:58 -0000 Received: (qmail 4833 invoked by uid 500); 11 Mar 2011 23:42:58 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 4782 invoked by uid 500); 11 Mar 2011 23:42:58 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 4775 invoked by uid 99); 11 Mar 2011 23:42:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Mar 2011 23:42:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Mar 2011 23:42:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA4E32388962; Fri, 11 Mar 2011 23:42:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1080798 - in /hadoop/common/branches/branch-0.22: ./ CHANGES.txt src/docs/ src/java/ src/java/org/apache/hadoop/io/compress/CodecPool.java src/test/core/ src/test/core/org/apache/hadoop/io/TestSequenceFile.java Date: Fri, 11 Mar 2011 23:42:34 -0000 To: common-commits@hadoop.apache.org From: eli@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110311234234.AA4E32388962@eris.apache.org> Author: eli Date: Fri Mar 11 23:42:34 2011 New Revision: 1080798 URL: http://svn.apache.org/viewvc?rev=1080798&view=rev Log: HADOOP-7177. svn merge -c 1080797 from trunk Modified: hadoop/common/branches/branch-0.22/ (props changed) hadoop/common/branches/branch-0.22/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-0.22/src/docs/ (props changed) hadoop/common/branches/branch-0.22/src/java/ (props changed) hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/compress/CodecPool.java hadoop/common/branches/branch-0.22/src/test/core/ (props changed) hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java (props changed) Propchange: hadoop/common/branches/branch-0.22/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 11 23:42:34 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084 +/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797 /hadoop/core/branches/branch-0.19/core:713112 Modified: hadoop/common/branches/branch-0.22/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1080798&r1=1080797&r2=1080798&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.22/CHANGES.txt Fri Mar 11 23:42:34 2011 @@ -438,6 +438,9 @@ Release 0.21.1 - Unreleased HADOOP-6786. test-patch needs to verify Herriot integrity (cos) + HADOOP-7177. CodecPool should report which compressor it is using. + (Allen Wittenauer via eli) + BUG FIXES HADOOP-6925. BZip2Codec incorrectly implements read(). Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 11 23:42:34 2011 @@ -1,4 +1,4 @@ -/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084 +/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278 Propchange: hadoop/common/branches/branch-0.22/src/docs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 11 23:42:34 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084 +/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797 /hadoop/core/branches/branch-0.19/src/docs:713112 Propchange: hadoop/common/branches/branch-0.22/src/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 11 23:42:34 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084 +/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797 /hadoop/core/branches/branch-0.19/core/src/java:713112 /hadoop/core/trunk/src/core:776175-785643,785929-786278 Modified: hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/compress/CodecPool.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/compress/CodecPool.java?rev=1080798&r1=1080797&r2=1080798&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/compress/CodecPool.java (original) +++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/compress/CodecPool.java Fri Mar 11 23:42:34 2011 @@ -104,7 +104,7 @@ public class CodecPool { Compressor compressor = borrow(compressorPool, codec.getCompressorType()); if (compressor == null) { compressor = codec.createCompressor(); - LOG.info("Got brand-new compressor"); + LOG.info("Got brand-new compressor ["+codec.getDefaultExtension()+"]"); } else { compressor.reinit(conf); if(LOG.isDebugEnabled()) { @@ -131,7 +131,7 @@ public class CodecPool { Decompressor decompressor = borrow(decompressorPool, codec.getDecompressorType()); if (decompressor == null) { decompressor = codec.createDecompressor(); - LOG.info("Got brand-new decompressor"); + LOG.info("Got brand-new decompressor ["+codec.getDefaultExtension()+"]"); } else { if(LOG.isDebugEnabled()) { LOG.debug("Got recycled decompressor"); Propchange: hadoop/common/branches/branch-0.22/src/test/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 11 23:42:34 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084 +/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797 /hadoop/core/branches/branch-0.19/core/src/test/core:713112 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278 Propchange: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 11 23:42:34 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084 +/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643