You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by jd...@apache.org on 2012/04/23 04:27:07 UTC
svn commit: r1329030 - in
/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit:
TestMapReduceDriver.java TestPipelineMapReduceDriver.java
mapreduce/TestMapReduceDriver.java
Author: jdonofrio
Date: Mon Apr 23 02:27:06 2012
New Revision: 1329030
URL: http://svn.apache.org/viewvc?rev=1329030&view=rev
Log:
MRUNIT-105: testJavaSerialization methods fail in Java 7 because they do not set a group comparator
Modified:
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java?rev=1329030&r1=1329029&r2=1329030&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java Mon Apr 23 02:27:06 2012
@@ -395,6 +395,20 @@ public class TestMapReduceDriver {
.runTest();
}
+ public static final RawComparator<Integer> INTEGER_COMPARATOR = new RawComparator<Integer>() {
+
+ @Override
+ public int compare(Integer o1, Integer o2) {
+ return o1.compareTo(o2);
+ }
+
+ @Override
+ public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
+ throw new UnsupportedOperationException();
+ }
+
+ };
+
@Test
public void testJavaSerialization() {
final Configuration conf = new Configuration();
@@ -404,8 +418,9 @@ public class TestMapReduceDriver {
.newMapReduceDriver(new IdentityMapper<Integer, IntWritable>(),
new IdentityReducer<Integer, IntWritable>())
.withConfiguration(conf);
- driver.addInput(1, new IntWritable(2));
- driver.addOutput(1, new IntWritable(2));
+ driver.withKeyGroupingComparator(INTEGER_COMPARATOR);
+ driver.withInput(1, new IntWritable(2)).withInput(2, new IntWritable(3));
+ driver.withOutput(1, new IntWritable(2)).withOutput(2, new IntWritable(3));
driver.runTest();
}
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java?rev=1329030&r1=1329029&r2=1329030&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java Mon Apr 23 02:27:06 2012
@@ -21,10 +21,10 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Mapper;
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.lib.IdentityMapper;
@@ -191,9 +191,11 @@ public class TestPipelineMapReduceDriver
@Test
public void testJavaSerialization() {
- final Configuration conf = new Configuration();
+ final JobConf conf = new JobConf();
conf.setStrings("io.serializations", conf.get("io.serializations"),
"org.apache.hadoop.io.serializer.JavaSerialization");
+ conf.setOutputValueGroupingComparator(TestMapReduceDriver.INTEGER_COMPARATOR
+ .getClass());
final PipelineMapReduceDriver<Integer, IntWritable, Integer, IntWritable> driver = PipelineMapReduceDriver
.newPipelineMapReduceDriver();
driver.addMapReduce(new IdentityMapper<Integer, IntWritable>(),
@@ -202,8 +204,8 @@ public class TestPipelineMapReduceDriver
new IdentityReducer<Integer, IntWritable>());
driver.withConfiguration(conf);
- driver.addInput(1, new IntWritable(2));
- driver.addOutput(1, new IntWritable(2));
+ driver.withInput(1, new IntWritable(2)).withInput(2, new IntWritable(3));
+ driver.withOutput(1, new IntWritable(2)).withOutput(2, new IntWritable(3));
driver.runTest();
}
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java?rev=1329030&r1=1329029&r2=1329030&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java Mon Apr 23 02:27:06 2012
@@ -403,7 +403,10 @@ public class TestMapReduceDriver {
final MapReduceDriver<IntWritable, Integer, Integer, IntWritable, Integer, IntWritable> driver = MapReduceDriver
.newMapReduceDriver(new InverseMapper<IntWritable, Integer>(),
new IntSumReducer<Integer>()).withConfiguration(conf);
- driver.withInput(new IntWritable(1), 2).withOutput(2, new IntWritable(1))
+ driver
+ .setKeyGroupingComparator(org.apache.hadoop.mrunit.TestMapReduceDriver.INTEGER_COMPARATOR);
+ driver.withInput(new IntWritable(1), 2).withInput(new IntWritable(2), 3);
+ driver.withOutput(2, new IntWritable(1)).withOutput(3, new IntWritable(2))
.runTest();
}
}