You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2011/11/01 02:05:04 UTC
svn commit: r1195746 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
src/test/mapred/org/apache/hadoop/mapred/TestCombineOutputCollector.java
Author: acmurthy
Date: Tue Nov 1 01:05:04 2011
New Revision: 1195746
URL: http://svn.apache.org/viewvc?rev=1195746&view=rev
Log:
Merge -c 1195745 from trunk to branch-0.23 to fix MAPREDUCE-3220.
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineOutputCollector.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1195746&r1=1195745&r2=1195746&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue Nov 1 01:05:04 2011
@@ -1855,6 +1855,8 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3321. Disabled a few MR tests for 0.23. (Hitesh Shah via
acmurthy)
+ MAPREDUCE-3220. Fixed TestCombineOutputCollector. (Devaraj K via acmurthy)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineOutputCollector.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineOutputCollector.java?rev=1195746&r1=1195745&r2=1195746&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineOutputCollector.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineOutputCollector.java Tue Nov 1 01:05:04 2011
@@ -31,17 +31,17 @@ import org.apache.hadoop.mapred.Counters
import org.apache.hadoop.mapred.IFile.Writer;
import org.apache.hadoop.mapred.Task.CombineOutputCollector;
import org.apache.hadoop.mapred.Task.TaskReporter;
+import org.apache.hadoop.mapreduce.MRJobConfig;
import org.junit.Test;
public class TestCombineOutputCollector {
private CombineOutputCollector<String, Integer> coc;
Counters.Counter outCounter = new Counters.Counter() {
-
+ private long value;
@Override
public void setValue(long value) {
- // TODO Auto-generated method stub
-
+ this.value = value;
}
@Override
@@ -52,14 +52,12 @@ public class TestCombineOutputCollector
@Override
public void increment(long incr) {
- // TODO Auto-generated method stub
-
+ this.value += incr;
}
@Override
public long getValue() {
- // TODO Auto-generated method stub
- return 0;
+ return value;
}
@Override
@@ -82,8 +80,7 @@ public class TestCombineOutputCollector
@Override
public long getCounter() {
- // TODO Auto-generated method stub
- return 0;
+ return value;
}
@Override
@@ -108,7 +105,7 @@ public class TestCombineOutputCollector
Writer<String, Integer> mockWriter = mock(Writer.class);
Configuration conf = new Configuration();
- conf.set("mapred.combine.recordsBeforeProgress", "2");
+ conf.set(MRJobConfig.COMBINE_RECORDS_BEFORE_PROGRESS, "2");
coc = new CombineOutputCollector<String, Integer>(outCounter, mockTaskReporter, conf);
coc.setWriter(mockWriter);