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

MAPREDUCE-5995. native-task: Revert changes to Text internals. Contributed by Todd Lipcon. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613828 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2014-07-27 19:04:14 +00:00
parent 43917e564d
commit 78d86a9839
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java
View File

@ -226,10 +226,6 @@ public class Text extends BinaryComparable
this.length = len;
}
public void setLength(int len) {
this.length = len;
}
/**
* Append a range of bytes to the end of the given text
* @param utf8 the data to copy from
@ -264,7 +260,7 @@ public class Text extends BinaryComparable
* @param len the number of bytes we need
* @param keepData should the old data be kept
*/
public void setCapacity(int len, boolean keepData) {
private void setCapacity(int len, boolean keepData) {
if (bytes == null || bytes.length < len) {
if (bytes != null && keepData) {
bytes = Arrays.copyOf(bytes, Math.max(len,length << 1));

1
hadoop-mapreduce-project/CHANGES.MAPREDUCE-2841.txt
View File

@ -7,3 +7,4 @@ MAPREDUCE-5996. native-task: Rename system tests into standard directory layout
MAPREDUCE-5997. native-task: Use DirectBufferPool from Hadoop Common (todd)
MAPREDUCE-6000. native-task: Simplify ByteBufferDataReader/Writer (todd)
MAPREDUCE-5991. native-task should not run unit tests if native profile is not enabled. (Binglin Chang)
MAPREDUCE-5995. native-task: Revert changes to Text internals (todd)

9
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/java/org/apache/hadoop/mapred/nativetask/serde/TextSerializer.java
View File

@ -42,13 +42,6 @@ public class TextSerializer implements INativeSerializer<Text>, INativeComparabl
@Override
public void deserialize(DataInput in, int length, Text w) throws IOException {
try {
w.setCapacity(length, true);
w.setLength(length);
} catch (final Exception e) {
throw new IOException(e);
}
final byte[] bytes = w.getBytes();
in.readFully(bytes, 0, length);
w.readWithKnownLength(in, length);
}
}