Repository: hadoop Updated Branches: refs/heads/branch-2 5e403e8b8 -> bb828565f
MAPREDUCE-5755. MapTask.MapOutputBuffer#compare/swap should have @Override annotation. (ozawa) (cherry picked from commit bb243cea93b6872ef8956311a2290ca0b83ebb22) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bb828565 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bb828565 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bb828565 Branch: refs/heads/branch-2 Commit: bb828565f8b45e87d9083e32f22336a7d510db61 Parents: 5e403e8 Author: Tsuyoshi Ozawa <[email protected]> Authored: Tue Mar 17 14:55:15 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Tue Mar 17 14:55:33 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/mapred/MapTask.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb828565/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c8aa10a..ec0e49d 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -18,6 +18,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-4414. Add main methods to JobConf and YarnConfiguration, for debug purposes. (Plamen Jeliazkov via harsh) + MAPREDUCE-5755. MapTask.MapOutputBuffer#compare/swap should have + @Override annotation. (ozawa) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb828565/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java index 8094317..c4957b7 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java @@ -1255,6 +1255,7 @@ public class MapTask extends Task { * Compare by partition, then by key. * @see IndexedSortable#compare */ + @Override public int compare(final int mi, final int mj) { final int kvi = offsetFor(mi % maxRec); final int kvj = offsetFor(mj % maxRec); @@ -1278,6 +1279,7 @@ public class MapTask extends Task { * Swap metadata for items i, j * @see IndexedSortable#swap */ + @Override public void swap(final int mi, final int mj) { int iOff = (mi % maxRec) * METASIZE; int jOff = (mj % maxRec) * METASIZE;
