Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 26192 invoked from network); 4 Apr 2007 19:12:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Apr 2007 19:12:58 -0000 Received: (qmail 25360 invoked by uid 500); 4 Apr 2007 19:12:55 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 25330 invoked by uid 500); 4 Apr 2007 19:12:55 -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 25303 invoked by uid 99); 4 Apr 2007 19:12:55 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 12:12:55 -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; Wed, 04 Apr 2007 12:12:47 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1581A1A9838; Wed, 4 Apr 2007 12:12:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r525581 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/JobConf.java Date: Wed, 04 Apr 2007 19:12:26 -0000 To: hadoop-commits@lucene.apache.org From: tomwhite@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070404191227.1581A1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tomwhite Date: Wed Apr 4 12:12:26 2007 New Revision: 525581 URL: http://svn.apache.org/viewvc?view=rev&rev=525581 Log: HADOOP-1194. Make compression style record level for map output compression. Contributed by Arun C Murthy. Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobConf.java Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=525581&r1=525580&r2=525581 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Wed Apr 4 12:12:26 2007 @@ -100,6 +100,9 @@ 31. HADOOP-1163. Fix ganglia metrics to aggregate metrics from different hosts properly. (Michael Bieniosek via tomwhite) +32. HADOOP-1194. Make compression style record level for map output + compression. (Arun C Murthy via tomwhite) + Release 0.12.3 (not yet released) Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobConf.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobConf.java?view=diff&rev=525581&r1=525580&r2=525581 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobConf.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobConf.java Wed Apr 4 12:12:26 2007 @@ -334,12 +334,8 @@ * @return the compression type, defaulting to job output compression type */ public SequenceFile.CompressionType getMapOutputCompressionType() { - String val = get("map.output.compression.type"); - if (val == null) { - return SequenceFile.getCompressionType(this); - } else { - return SequenceFile.CompressionType.valueOf(val); - } + String val = get("map.output.compression.type", "RECORD"); + return SequenceFile.CompressionType.valueOf(val); } /**