You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2015/06/05 18:17:21 UTC
hadoop git commit: MAPREDUCE-6387. Serialize the recently added
Task#encryptedSpillKey field at the end. (Arun Suresh via kasha)
Repository: hadoop
Updated Branches:
refs/heads/trunk 09b8241e6 -> 6786daab3
MAPREDUCE-6387. Serialize the recently added Task#encryptedSpillKey field at the end. (Arun Suresh via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6786daab
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6786daab
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6786daab
Branch: refs/heads/trunk
Commit: 6786daab33792c9c426adf0fc6b361f193d356a8
Parents: 09b8241
Author: Karthik Kambatla <ka...@apache.org>
Authored: Fri Jun 5 09:14:06 2015 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Fri Jun 5 09:14:06 2015 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/mapred/Task.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6786daab/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 1813c31..339a7fa 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -496,6 +496,9 @@ Release 2.7.1 - UNRELEASED
copySucceeded() in one thread and copyFailed() in another thread on the
same host. (Junping Du via ozawa)
+ MAPREDUCE-6387. Serialize the recently added Task#encryptedSpillKey field at
+ the end. (Arun Suresh via kasha)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6786daab/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java
index c07d517..673f183 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java
@@ -513,8 +513,8 @@ abstract public class Task implements Writable, Configurable {
out.writeBoolean(taskCleanup);
Text.writeString(out, user);
out.writeInt(encryptedSpillKey.length);
- out.write(encryptedSpillKey);
extraData.write(out);
+ out.write(encryptedSpillKey);
}
public void readFields(DataInput in) throws IOException {
@@ -541,8 +541,8 @@ abstract public class Task implements Writable, Configurable {
user = StringInterner.weakIntern(Text.readString(in));
int len = in.readInt();
encryptedSpillKey = new byte[len];
- in.readFully(encryptedSpillKey);
extraData.readFields(in);
+ in.readFully(encryptedSpillKey);
}
@Override