Repository: hadoop Updated Branches: refs/heads/branch-2 ab80a572b -> dfc4a62f7
MAPREDUCE-3383. Duplicate job.getOutputValueGroupingComparator() in ReduceTask. Contributed by Binglin Chang (cherry picked from commit c39012f4a0444f9e4b7d67957d5192127d143d90) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dfc4a62f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dfc4a62f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dfc4a62f Branch: refs/heads/branch-2 Commit: dfc4a62f7df76f0508daab49d3c95f9c84e04acd Parents: ab80a57 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 21:17:05 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/dfc4a62f/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ac8c3be..4dbe18e 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/dfc4a62f/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()) {
