You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by cd...@apache.org on 2010/01/25 06:11:47 UTC
svn commit: r902710 - in /hadoop/mapreduce/branches/branch-0.21: CHANGES.txt
src/java/org/apache/hadoop/mapred/MapTask.java
src/java/org/apache/hadoop/mapreduce/JobContext.java
src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
Author: cdouglas
Date: Mon Jan 25 05:11:45 2010
New Revision: 902710
URL: http://svn.apache.org/viewvc?rev=902710&view=rev
Log:
MAPREDUCE-1406. Fix spelling of JobContext.MAP_COMBINE_MIN_SPILLS.
Modified:
hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTask.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobContext.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=902710&r1=902709&r2=902710&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Mon Jan 25 05:11:45 2010
@@ -931,3 +931,6 @@
MAPREDUCE-1365. Restore accidentally renamed test in
TestTaskTrackerBloacklisting. (Amareshwari Sriramadasu via cdouglas)
+
+ MAPREDUCE-1406. Fix spelling of JobContext.MAP_COMBINE_MIN_SPILLS.
+ (cdouglas)
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTask.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTask.java?rev=902710&r1=902709&r2=902710&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTask.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTask.java Mon Jan 25 05:11:45 2010
@@ -832,7 +832,7 @@
} else {
combineCollector = null;
}
- minSpillsForCombine = job.getInt(JobContext.MAP_COMBINE_MIN_SPISS, 3);
+ minSpillsForCombine = job.getInt(JobContext.MAP_COMBINE_MIN_SPILLS, 3);
spillThread.setDaemon(true);
spillThread.setName("SpillThread");
spillLock.lock();
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobContext.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobContext.java?rev=902710&r1=902709&r2=902710&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobContext.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobContext.java Mon Jan 25 05:11:45 2010
@@ -162,7 +162,7 @@
"mapreduce.map.skip.proc-count.auto-incr";
public static final String MAP_SKIP_MAX_RECORDS =
"mapreduce.map.skip.maxrecords";
- public static final String MAP_COMBINE_MIN_SPISS =
+ public static final String MAP_COMBINE_MIN_SPILLS =
"mapreduce.map.combine.minspills";
public static final String MAP_OUTPUT_COMPRESS =
"mapreduce.map.output.compress";
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java?rev=902710&r1=902709&r2=902710&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java Mon Jan 25 05:11:45 2010
@@ -324,7 +324,7 @@
Configuration.addDeprecation("mapred.skip.map.max.skip.records",
new String[] {JobContext.MAP_SKIP_MAX_RECORDS});
Configuration.addDeprecation("min.num.spills.for.combine",
- new String[] {JobContext.MAP_COMBINE_MIN_SPISS});
+ new String[] {JobContext.MAP_COMBINE_MIN_SPILLS});
Configuration.addDeprecation("mapred.compress.map.output",
new String[] {JobContext.MAP_OUTPUT_COMPRESS});
Configuration.addDeprecation("mapred.map.output.compression.codec",