svn commit: r778289 - in /hadoop/core/trunk: CHANGES.txt src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamJob.java

[sh...@apache.org]

Author: sharad
Date: Mon May 25 05:58:38 2009
New Revision: 778289

URL: http://svn.apache.org/viewvc?rev=778289&view=rev
Log:
HADOOP-5252. Streaming overrides -inputformat option. Contributed by Klaas Bosteels.

Added:
    hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamJob.java
Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=778289&r1=778288&r2=778289&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon May 25 05:58:38 2009
@@ -670,6 +670,9 @@
 
     HADOOP-5847. Fixed failing Streaming unit tests (gkesavan) 
 
+    HADOOP-5252. Streaming overrides -inputformat option (Klaas Bosteels 
+    via sharad)
+
 Release 0.20.1 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?rev=778289&r1=778288&r2=778289&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Mon May 25 05:58:38 2009
@@ -727,6 +727,9 @@
           || inputFormatSpec_.equals(KeyValueTextInputFormat.class
               .getCanonicalName())
           || inputFormatSpec_.equals(KeyValueTextInputFormat.class.getSimpleName())) {
+        if (inReaderSpec_ == null) {
+          fmt = KeyValueTextInputFormat.class;
+        }
       } else if (inputFormatSpec_.equals(SequenceFileInputFormat.class
           .getName())
           || inputFormatSpec_
@@ -734,6 +737,9 @@
                   .getCanonicalName())
           || inputFormatSpec_
               .equals(org.apache.hadoop.mapred.SequenceFileInputFormat.class.getSimpleName())) {
+        if (inReaderSpec_ == null) {
+          fmt = SequenceFileInputFormat.class;
+        }
       } else if (inputFormatSpec_.equals(SequenceFileAsTextInputFormat.class
           .getName())
           || inputFormatSpec_.equals(SequenceFileAsTextInputFormat.class

Added: hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamJob.java?rev=778289&view=auto
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamJob.java (added)
+++ hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamJob.java Mon May 25 05:58:38 2009
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.streaming;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.KeyValueTextInputFormat;
+import org.apache.hadoop.mapred.SequenceFileInputFormat;
+
+import junit.framework.TestCase;
+
+/**
+ * This class tests hadoop Streaming's StreamJob class.
+ */
+public class TestStreamJob extends TestCase {
+
+  public void testCreateJob() throws IOException {
+    JobConf job;
+    ArrayList<String> dummyArgs = new ArrayList<String>();
+    dummyArgs.add("-input"); dummyArgs.add("dummy");
+    dummyArgs.add("-output"); dummyArgs.add("dummy");
+    dummyArgs.add("-mapper"); dummyArgs.add("dummy");
+    dummyArgs.add("-reducer"); dummyArgs.add("dummy");
+    ArrayList<String> args;
+    
+    args = new ArrayList<String>(dummyArgs);
+    args.add("-inputformat");
+    args.add("org.apache.hadoop.mapred.KeyValueTextInputFormat");
+    job = StreamJob.createJob(args.toArray(new String[] {}));
+    assertEquals(KeyValueTextInputFormat.class, job.getInputFormat().getClass());
+    
+    args = new ArrayList<String>(dummyArgs);
+    args.add("-inputformat");
+    args.add("org.apache.hadoop.mapred.SequenceFileInputFormat");
+    job = StreamJob.createJob(args.toArray(new String[] {}));
+    assertEquals(SequenceFileInputFormat.class, job.getInputFormat().getClass());
+    
+    args = new ArrayList<String>(dummyArgs);
+    args.add("-inputformat");
+    args.add("org.apache.hadoop.mapred.KeyValueTextInputFormat");
+    args.add("-inputreader");
+    args.add("StreamXmlRecordReader,begin=<doc>,end=</doc>");
+    job = StreamJob.createJob(args.toArray(new String[] {}));
+    assertEquals(StreamInputFormat.class, job.getInputFormat().getClass());
+  }
+  
+}