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 ac...@apache.org on 2013/08/08 20:51:03 UTC
svn commit: r1511943 - in /hadoop/common/branches/branch-1.2: CHANGES.txt
src/mapred/org/apache/hadoop/mapred/IFile.java
src/mapred/org/apache/hadoop/mapred/ReduceTask.java
Author: acmurthy
Date: Thu Aug 8 18:51:03 2013
New Revision: 1511943
URL: http://svn.apache.org/r1511943
Log:
MAPREDUCE-5450. Unnecessary Configuration instantiation in IFileInputStream slows down merge. Contributed by Stanislav Barton.
Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/IFile.java
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1511943&r1=1511942&r2=1511943&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Thu Aug 8 18:51:03 2013
@@ -1,5 +1,20 @@
Hadoop Change Log
+Release 1.2.2 - unreleased
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
+ MAPREDUCE-5450. Unnecessary Configuration instantiation in IFileInputStream
+ slows down merge. (Stanislav Barton and Ted Yu via Sandy Ryza)
+
Release 1.2.1 - 2013.07.15
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/IFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/IFile.java?rev=1511943&r1=1511942&r2=1511943&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/IFile.java (original)
+++ hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/IFile.java Thu Aug 8 18:51:03 2013
@@ -462,9 +462,9 @@ class IFile {
TaskAttemptID taskAttemptId;
public InMemoryReader(RamManager ramManager, TaskAttemptID taskAttemptId,
- byte[] data, int start, int length)
+ byte[] data, int start, int length, Configuration conf)
throws IOException {
- super(null, null, length - start, null, null);
+ super(conf, null, length - start, null, null);
this.ramManager = ramManager;
this.taskAttemptId = taskAttemptId;
Modified: hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/ReduceTask.java?rev=1511943&r1=1511942&r2=1511943&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/ReduceTask.java (original)
+++ hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/ReduceTask.java Thu Aug 8 18:51:03 2013
@@ -2417,7 +2417,7 @@ class ReduceTask extends Task {
fullSize -= mo.data.length;
Reader<K, V> reader =
new InMemoryReader<K, V>(ramManager, mo.mapAttemptId,
- mo.data, 0, mo.data.length);
+ mo.data, 0, mo.data.length, conf);
Segment<K, V> segment =
new Segment<K, V>(reader, true);
inMemorySegments.add(segment);