Skip to content

Commit 3189910

Browse files
committed
MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1341151 13f79535-47bb-0310-9956-ffa450edef68
1 parent 64f906d commit 3189910

File tree

2 files changed

+7
-1
lines changed
  • hadoop-mapreduce-project

2 files changed

+7
-1
lines changed

hadoop-mapreduce-project/CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ Release 2.0.1-alpha - UNRELEASED
130130
MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not
131131
from default file system. (Bhallamudi Venkata Siva Kamesh via todd)
132132

133+
MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta.
134+
(todd via bobby)
135+
133136
Release 2.0.0-alpha - UNRELEASED
134137

135138
INCOMPATIBLE CHANGES

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.io.IOException;
2626
import java.io.OutputStream;
2727
import java.nio.ByteBuffer;
28+
import java.nio.ByteOrder;
2829
import java.nio.IntBuffer;
2930
import java.util.ArrayList;
3031
import java.util.List;
@@ -911,7 +912,9 @@ public MapOutputBuffer(TaskUmbilicalProtocol umbilical, JobConf job,
911912
maxMemUsage -= maxMemUsage % METASIZE;
912913
kvbuffer = new byte[maxMemUsage];
913914
bufvoid = kvbuffer.length;
914-
kvmeta = ByteBuffer.wrap(kvbuffer).asIntBuffer();
915+
kvmeta = ByteBuffer.wrap(kvbuffer)
916+
.order(ByteOrder.nativeOrder())
917+
.asIntBuffer();
915918
setEquator(0);
916919
bufstart = bufend = bufindex = equator;
917920
kvstart = kvend = kvindex;

0 commit comments

Comments
 (0)