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 jl...@apache.org on 2015/05/08 22:49:28 UTC

hadoop git commit: MAPREDUCE-3383. Duplicate job.getOutputValueGroupingComparator() in ReduceTask. Contributed by Binglin Chang

Repository: hadoop
Updated Branches:
  refs/heads/trunk c4bd2cdde -> c39012f4a


MAPREDUCE-3383. Duplicate job.getOutputValueGroupingComparator() in ReduceTask. Contributed by Binglin Chang


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c39012f4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c39012f4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c39012f4

Branch: refs/heads/trunk
Commit: c39012f4a0444f9e4b7d67957d5192127d143d90
Parents: c4bd2cd
Author: Jason Lowe <jl...@apache.org>
Authored: Fri May 8 20:48:44 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Fri May 8 20:48:44 2015 +0000

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                              | 3 +++
 .../src/main/java/org/apache/hadoop/mapred/ReduceTask.java        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c39012f4/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 3df8fd5..ba9da73 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -394,6 +394,9 @@ Release 2.8.0 - UNRELEASED
 
     MAPREDUCE-6342. Make POM project names consistent. (Rohith via devaraj)
 
+    MAPREDUCE-3383. Duplicate job.getOutputValueGroupingComparator() in
+    ReduceTask (Binglin Chang via jlowe)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c39012f4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ReduceTask.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ReduceTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ReduceTask.java
index c1391fa..c90e38b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ReduceTask.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ReduceTask.java
@@ -436,7 +436,7 @@ public class ReduceTask extends Task {
               comparator, keyClass, valueClass, 
               job, reporter, umbilical) :
           new ReduceValuesIterator<INKEY,INVALUE>(rIter, 
-          job.getOutputValueGroupingComparator(), keyClass, valueClass, 
+          comparator, keyClass, valueClass,
           job, reporter);
       values.informReduceProgress();
       while (values.more()) {