From hadoop-commits-return-1337-apmail-lucene-hadoop-commits-archive=lucene.apache.org@lucene.apache.org Fri Mar 23 18:03:38 2007 Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 50145 invoked from network); 23 Mar 2007 18:03:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Mar 2007 18:03:37 -0000 Received: (qmail 9403 invoked by uid 500); 23 Mar 2007 18:03:45 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 9380 invoked by uid 500); 23 Mar 2007 18:03:44 -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 9370 invoked by uid 99); 23 Mar 2007 18:03:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2007 11:03:44 -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; Fri, 23 Mar 2007 11:03:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5AFFD1A9838; Fri, 23 Mar 2007 11:03:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r521835 - in /lucene/hadoop/trunk: CHANGES.txt src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Date: Fri, 23 Mar 2007 18:03:16 -0000 To: hadoop-commits@lucene.apache.org From: tomwhite@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070323180316.5AFFD1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tomwhite Date: Fri Mar 23 11:03:15 2007 New Revision: 521835 URL: http://svn.apache.org/viewvc?view=rev&rev=521835 Log: HADOOP-1150. Fix streaming -reducer and -mapper to give them defaults. Contributed by Owen O'Malley. Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=521835&r1=521834&r2=521835 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Fri Mar 23 11:03:15 2007 @@ -11,6 +11,9 @@ 3. HADOOP-1140. Fix a deadlock in metrics. (David Bowen via cutting) + 4. HADOOP-1150. Fix streaming -reducer and -mapper to give them + defaults. (Owen O'Malley via tomwhite) + Release 0.12.1 - 2007-03-17 Modified: lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?view=diff&rev=521835&r1=521834&r2=521835 ============================================================================== --- lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original) +++ lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Fri Mar 23 11:03:15 2007 @@ -368,12 +368,12 @@ "DFS output directory for the Reduce step", "path", 1, true); Option mapper = createOption("mapper", - "The streaming command to run", "cmd", 1, true); + "The streaming command to run", "cmd", 1, false); Option combiner = createOption("combiner", "The streaming command to run", "cmd",1, false); // reducer could be NONE Option reducer = createOption("reducer", - "The streaming command to run", "cmd", 1, true); + "The streaming command to run", "cmd", 1, false); Option file = createOption("file", "File/dir to be shipped in the Job jar file", "file", Integer.MAX_VALUE, false, execValidator); @@ -692,12 +692,16 @@ String defaultPackage = this.getClass().getPackage().getName(); - Class c = StreamUtil.goodClassOrNull(mapCmd_, defaultPackage); - if (c != null) { - jobConf_.setMapperClass(c); - } else { - jobConf_.setMapperClass(PipeMapper.class); - jobConf_.set("stream.map.streamprocessor", URLEncoder.encode(mapCmd_, "UTF-8")); + Class c; + if (mapCmd_ != null) { + c = StreamUtil.goodClassOrNull(mapCmd_, defaultPackage); + if (c != null) { + jobConf_.setMapperClass(c); + } else { + jobConf_.setMapperClass(PipeMapper.class); + jobConf_.set("stream.map.streamprocessor", + URLEncoder.encode(mapCmd_, "UTF-8")); + } } if (comCmd_ != null) {