Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. Contributed by Kai Sasaki. 

(cherry picked from commit 5cc44d18aa)
This commit is contained in:
Akira Ajisaka 2016-01-15 00:44:24 +09:00
parent f0b1b53173
commit 7c4be15991
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -397,6 +397,8 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-6068. Illegal progress value warnings in map tasks. (Binglin Chang MAPREDUCE-6068. Illegal progress value warnings in map tasks. (Binglin Chang
via junping_du) via junping_du)
MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. (Kai Sasaki via aajisaka)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
View File

@ -1258,7 +1258,7 @@ public class Job extends JobContextImpl implements JobContext {
/** /**
* Default to the new APIs unless they are explicitly set or the old mapper or * Default to the new APIs unless they are explicitly set or the old mapper or
* reduce attributes are used. * reduce attributes are used.
* @throws IOException if the configuration is inconsistant * @throws IOException if the configuration is inconsistent
*/ */
private void setUseNewAPI() throws IOException { private void setUseNewAPI() throws IOException {
int numReduces = conf.getNumReduceTasks(); int numReduces = conf.getNumReduceTasks();
@ -1276,7 +1276,7 @@ public class Job extends JobContextImpl implements JobContext {
ensureNotSet("mapred.output.format.class", mode); ensureNotSet("mapred.output.format.class", mode);
} }
} else { } else {
String mode = "map compatability"; String mode = "map compatibility";
ensureNotSet(INPUT_FORMAT_CLASS_ATTR, mode); ensureNotSet(INPUT_FORMAT_CLASS_ATTR, mode);
ensureNotSet(MAP_CLASS_ATTR, mode); ensureNotSet(MAP_CLASS_ATTR, mode);
if (numReduces != 0) { if (numReduces != 0) {
@ -1293,7 +1293,7 @@ public class Job extends JobContextImpl implements JobContext {
ensureNotSet("mapred.output.format.class", mode); ensureNotSet("mapred.output.format.class", mode);
ensureNotSet(oldReduceClass, mode); ensureNotSet(oldReduceClass, mode);
} else { } else {
String mode = "reduce compatability"; String mode = "reduce compatibility";
ensureNotSet(OUTPUT_FORMAT_CLASS_ATTR, mode); ensureNotSet(OUTPUT_FORMAT_CLASS_ATTR, mode);
ensureNotSet(REDUCE_CLASS_ATTR, mode); ensureNotSet(REDUCE_CLASS_ATTR, mode);
} }