From dfc4a62f7df76f0508daab49d3c95f9c84e04acd Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Fri, 8 May 2015 20:48:44 +0000 Subject: [PATCH] MAPREDUCE-3383. Duplicate job.getOutputValueGroupingComparator() in ReduceTask. Contributed by Binglin Chang (cherry picked from commit c39012f4a0444f9e4b7d67957d5192127d143d90) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/mapred/ReduceTask.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ac8c3be4b53..4dbe18e1c0c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -139,6 +139,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 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 c1391fa6feb..c90e38bfe9a 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(rIter, - job.getOutputValueGroupingComparator(), keyClass, valueClass, + comparator, keyClass, valueClass, job, reporter); values.informReduceProgress(); while (values.more()) {