Procházet zdrojové kódy

HADOOP-3773. Change Pipes to set the default map output key and value
types correctly. (Koji Noguchi via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@685425 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley před 17 roky
rodič
revize
7400ac448d

+ 3 - 0
CHANGES.txt

@@ -295,6 +295,9 @@ Trunk (unreleased changes)
     HADOOP-3903. Change the package name for the servlets to be hdfs instead of
     HADOOP-3903. Change the package name for the servlets to be hdfs instead of
     dfs. (Tsz Wo (Nicholas) Sze via omalley)
     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
 Release 0.18.0 - Unreleased
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 3 - 3
src/mapred/org/apache/hadoop/mapred/pipes/Submitter.java

@@ -211,7 +211,7 @@ public class Submitter {
    * @throws IOException
    * @throws IOException
    */
    */
   public static RunningJob submitJob(JobConf conf) 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)) {
     if (!getIsJavaMapper(conf)) {
       conf.setMapRunnerClass(PipesMapRunner.class);
       conf.setMapRunnerClass(PipesMapRunner.class);
       // Save the user's partitioner and hook in our's.
       // Save the user's partitioner and hook in our's.
@@ -225,8 +225,8 @@ public class Submitter {
       }
       }
     }
     }
     String textClassname = Text.class.getName();
     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.key.class", textClassname);
     setIfUnset(conf, "mapred.output.value.class", textClassname);
     setIfUnset(conf, "mapred.output.value.class", textClassname);
     String exec = getExecutable(conf);
     String exec = getExecutable(conf);