Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-5755. MapTask.MapOutputBuffer#compare/swap should have @Override annotation. (ozawa) 

(cherry picked from commit bb243cea93)
This commit is contained in:
Tsuyoshi Ozawa 2015-03-17 14:55:15 +09:00
parent 5e403e8b8d
commit bb828565f8
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-4414. Add main methods to JobConf and YarnConfiguration, MAPREDUCE-4414. Add main methods to JobConf and YarnConfiguration,
for debug purposes. (Plamen Jeliazkov via harsh) for debug purposes. (Plamen Jeliazkov via harsh)
MAPREDUCE-5755. MapTask.MapOutputBuffer#compare/swap should have
@Override annotation. (ozawa)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java
View File

@ -1255,6 +1255,7 @@ public class MapTask extends Task {
* Compare by partition, then by key. * Compare by partition, then by key.
* @see IndexedSortable#compare * @see IndexedSortable#compare
*/ */
@Override
public int compare(final int mi, final int mj) { public int compare(final int mi, final int mj) {
final int kvi = offsetFor(mi % maxRec); final int kvi = offsetFor(mi % maxRec);
final int kvj = offsetFor(mj % maxRec); final int kvj = offsetFor(mj % maxRec);
@ -1278,6 +1279,7 @@ public class MapTask extends Task {
* Swap metadata for items i, j * Swap metadata for items i, j
* @see IndexedSortable#swap * @see IndexedSortable#swap
*/ */
@Override
public void swap(final int mi, final int mj) { public void swap(final int mi, final int mj) {
int iOff = (mi % maxRec) * METASIZE; int iOff = (mi % maxRec) * METASIZE;
int jOff = (mj % maxRec) * METASIZE; int jOff = (mj % maxRec) * METASIZE;