svn commit: r685425 - in /hadoop/core/trunk: CHANGES.txt src/mapred/org/apache/hadoop/mapred/pipes/Submitter.java

[om...@apache.org]

Author: omalley
Date: Tue Aug 12 20:32:03 2008
New Revision: 685425

URL: http://svn.apache.org/viewvc?rev=685425&view=rev
Log:
HADOOP-3773. Change Pipes to set the default map output key and value 
types correctly. (Koji Noguchi via omalley)

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/pipes/Submitter.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=685425&r1=685424&r2=685425&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Aug 12 20:32:03 2008
@@ -295,6 +295,9 @@
     HADOOP-3903. Change the package name for the servlets to be hdfs instead of
     dfs. (Tsz Wo (Nicholas) Sze via omalley)
 
+    HADOOP-3773. Change Pipes to set the default map output key and value 
+    types correctly. (Koji Noguchi via omalley)
+
 Release 0.18.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/pipes/Submitter.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/pipes/Submitter.java?rev=685425&r1=685424&r2=685425&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/pipes/Submitter.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/pipes/Submitter.java Tue Aug 12 20:32:03 2008
@@ -211,7 +211,7 @@
    * @throws IOException
    */
   public static RunningJob submitJob(JobConf conf) throws IOException {
-    // default map output types to BytesWritable
+    // default map output types to Text
     if (!getIsJavaMapper(conf)) {
       conf.setMapRunnerClass(PipesMapRunner.class);
       // Save the user's partitioner and hook in our's.
@@ -225,8 +225,8 @@
       }
     }
     String textClassname = Text.class.getName();
-    setIfUnset(conf, "mapred.output.key.class", textClassname);
-    setIfUnset(conf, "mapred.output.value.class", textClassname);
+    setIfUnset(conf, "mapred.mapoutput.key.class", textClassname);
+    setIfUnset(conf, "mapred.mapoutput.value.class", textClassname);
     setIfUnset(conf, "mapred.output.key.class", textClassname);
     setIfUnset(conf, "mapred.output.value.class", textClassname);
     String exec = getExecutable(conf);