big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-5531. Fix compat with hadoop-1 in mapreduce.(TaskID, TaskAttemptID) by re-introducing missing constructors. Contributed by Robert Kanter.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527033 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2013-09-27 19:08:28 +00:00
parent 2627e352d6
commit 58f40d3bf4
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,6 +234,10 @@ Release 2.1.2 - UNRELEASED
MAPREDUCE-5513. ConcurrentModificationException in JobControl (Robert MAPREDUCE-5513. ConcurrentModificationException in JobControl (Robert
Parker via jlowe) Parker via jlowe)
MAPREDUCE-5531. Fix compat with hadoop-1 in mapreduce.(TaskID,
TaskAttemptID) by re-introducing missing constructors. (Robert Kanter via
acmurthy)
Release 2.1.1-beta - 2013-09-23 Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

14
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/TaskAttemptID.java
View File

@ -76,6 +76,20 @@ public TaskAttemptID(String jtIdentifier, int jobId, TaskType type,
int taskId, int id) { int taskId, int id) {
this(new TaskID(jtIdentifier, jobId, type, taskId), id); this(new TaskID(jtIdentifier, jobId, type, taskId), id);
} }
/**
* Constructs a TaskId object from given parts.
* @param jtIdentifier jobTracker identifier
* @param jobId job number
* @param isMap whether the tip is a map
* @param taskId taskId number
* @param id the task attempt number
*/
@Deprecated
public TaskAttemptID(String jtIdentifier, int jobId, boolean isMap,
int taskId, int id) {
this(new TaskID(jtIdentifier, jobId, isMap, taskId), id);
}
public TaskAttemptID() { public TaskAttemptID() {
taskId = new TaskID(); taskId = new TaskID();

23
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/TaskID.java
View File

@ -91,6 +91,29 @@ public TaskID(JobID jobId, TaskType type, int id) {
public TaskID(String jtIdentifier, int jobId, TaskType type, int id) { public TaskID(String jtIdentifier, int jobId, TaskType type, int id) {
this(new JobID(jtIdentifier, jobId), type, id); this(new JobID(jtIdentifier, jobId), type, id);
} }
/**
* Constructs a TaskID object from given {@link JobID}.
* @param jobId JobID that this tip belongs to
* @param isMap whether the tip is a map
* @param id the tip number
*/
@Deprecated
public TaskID(JobID jobId, boolean isMap, int id) {
this(jobId, isMap ? TaskType.MAP : TaskType.REDUCE, id);
}
/**
* Constructs a TaskInProgressId object from given parts.
* @param jtIdentifier jobTracker identifier
* @param jobId job number
* @param isMap whether the tip is a map
* @param id the tip number
*/
@Deprecated
public TaskID(String jtIdentifier, int jobId, boolean isMap, int id) {
this(new JobID(jtIdentifier, jobId), isMap, id);
}
public TaskID() { public TaskID() {
jobId = new JobID(); jobId = new JobID();