You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tu...@apache.org on 2013/03/06 01:50:33 UTC
svn commit: r1453107 - in /hadoop/common/branches/branch-1: CHANGES.txt
src/mapred/org/apache/hadoop/mapred/Task.java
src/mapred/org/apache/hadoop/mapreduce/ReduceContext.java
Author: tucu
Date: Wed Mar 6 00:50:32 2013
New Revision: 1453107
URL: http://svn.apache.org/r1453107
Log:
MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu)
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/ReduceContext.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1453107&r1=1453106&r2=1453107&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Mar 6 00:50:32 2013
@@ -517,6 +517,9 @@ Release 1.2.0 - unreleased
HADOOP-9349. Confusing output when running hadoop version from one hadoop
installation when HADOOP_HOME points to another. (sandyr via tucu)
+ MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value.
+ (kkambatl via tucu)
+
Release 1.1.2 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java?rev=1453107&r1=1453106&r2=1453107&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java Wed Mar 6 00:50:32 2013
@@ -1256,7 +1256,8 @@ abstract public class Task implements Wr
more = in.next();
if (more) {
DataInputBuffer nextKeyBytes = in.getKey();
- keyIn.reset(nextKeyBytes.getData(), nextKeyBytes.getPosition(), nextKeyBytes.getLength());
+ keyIn.reset(nextKeyBytes.getData(), nextKeyBytes.getPosition(),
+ nextKeyBytes.getLength() - nextKeyBytes.getPosition());
nextKey = keyDeserializer.deserialize(nextKey);
hasNext = key != null && (comparator.compare(key, nextKey) == 0);
} else {
@@ -1270,7 +1271,8 @@ abstract public class Task implements Wr
*/
private void readNextValue() throws IOException {
DataInputBuffer nextValueBytes = in.getValue();
- valueIn.reset(nextValueBytes.getData(), nextValueBytes.getPosition(), nextValueBytes.getLength());
+ valueIn.reset(nextValueBytes.getData(), nextValueBytes.getPosition(),
+ nextValueBytes.getLength() - nextValueBytes.getPosition());
value = valDeserializer.deserialize(value);
}
}
Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/ReduceContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/ReduceContext.java?rev=1453107&r1=1453106&r2=1453107&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/ReduceContext.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/ReduceContext.java Wed Mar 6 00:50:32 2013
@@ -112,7 +112,8 @@ public class ReduceContext<KEYIN,VALUEIN
buffer.reset(currentRawKey.getBytes(), 0, currentRawKey.getLength());
key = keyDeserializer.deserialize(key);
next = input.getValue();
- buffer.reset(next.getData(), next.getPosition(), next.getLength());
+ buffer.reset(next.getData(), next.getPosition(),
+ next.getLength() - next.getPosition());
value = valueDeserializer.deserialize(value);
hasMore = input.next();
if (hasMore) {