Author: aw
Date: Thu Aug 14 16:00:18 2014
New Revision: 1617986
URL: http://svn.apache.org/r1617986
Log:
MAPREDUCE-5597. Missing alternatives in javadocs for deprecated constructors in
mapreduce.Job (Akira AJISAKA via aw)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1617986&r1=1617985&r2=1617986&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Aug 14
16:00:18 2014
@@ -166,6 +166,11 @@ Trunk (Unreleased)
MAPREDUCE-5363. Fix doc and spelling for TaskCompletionEvent#getTaskStatus
and getStatus (Akira AJISAKA via aw)
+ MAPREDUCE-5595. Typo in MergeManagerImpl.java (Akira AJISAKA via aw)
+
+ MAPREDUCE-5597. Missing alternatives in javadocs for deprecated
constructors
+ in mapreduce.Job (Akira AJISAKA via aw)
+
Release 2.6.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java?rev=1617986&r1=1617985&r2=1617986&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
Thu Aug 14 16:00:18 2014
@@ -54,7 +54,7 @@ import org.apache.hadoop.util.StringUtil
* <p>Here is an example on how to submit a job:</p>
* <p><blockquote><pre>
* // Create a new Job
- * Job job = new Job(new Configuration());
+ * Job job = Job.getInstance();
* job.setJarByClass(MyJob.class);
*
* // Specify various job-specific parameters
@@ -113,16 +113,25 @@ public class Job extends JobContextImpl
private long statustime;
private Cluster cluster;
+ /**
+ * @deprecated Use {@link #getInstance()}
+ */
@Deprecated
public Job() throws IOException {
this(new Configuration());
}
+ /**
+ * @deprecated Use {@link #getInstance(Configuration)}
+ */
@Deprecated
public Job(Configuration conf) throws IOException {
this(new JobConf(conf));
}
+ /**
+ * @deprecated Use {@link #getInstance(Configuration, String)}
+ */
@Deprecated
public Job(Configuration conf, String jobName) throws IOException {
this(conf);
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java?rev=1617986&r1=1617985&r2=1617986&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
Thu Aug 14 16:00:18 2014
@@ -197,7 +197,7 @@ public class MergeManagerImpl<K, V> impl
"memToMemMergeOutputsThreshold=" + memToMemMergeOutputsThreshold);
if (this.maxSingleShuffleLimit >= this.mergeThreshold) {
- throw new RuntimeException("Invlaid configuration: "
+ throw new RuntimeException("Invalid configuration: "
+ "maxSingleShuffleLimit should be less than mergeThreshold"
+ "maxSingleShuffleLimit: " + this.maxSingleShuffleLimit
+ "mergeThreshold: " + this.mergeThreshold);
