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

i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-05-21 19:07:13 +00:00
parent 8ba8542cde
commit 1586e827ed
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,9 @@ Release 2.0.1-alpha - UNRELEASED
MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not
from default file system. (Bhallamudi Venkata Siva Kamesh via todd) from default file system. (Bhallamudi Venkata Siva Kamesh via todd)
MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta.
(todd via bobby)
Release 2.0.0-alpha - UNRELEASED Release 2.0.0-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -25,6 +25,7 @@
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -911,7 +912,9 @@ public MapOutputBuffer(TaskUmbilicalProtocol umbilical, JobConf job,
maxMemUsage -= maxMemUsage % METASIZE; maxMemUsage -= maxMemUsage % METASIZE;
kvbuffer = new byte[maxMemUsage]; kvbuffer = new byte[maxMemUsage];
bufvoid = kvbuffer.length; bufvoid = kvbuffer.length;
kvmeta = ByteBuffer.wrap(kvbuffer).asIntBuffer(); kvmeta = ByteBuffer.wrap(kvbuffer)
.order(ByteOrder.nativeOrder())
.asIntBuffer();
setEquator(0); setEquator(0);
bufstart = bufend = bufindex = equator; bufstart = bufend = bufindex = equator;
kvstart = kvend = kvindex; kvstart = kvend = kvindex;