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/16 06:35:05 UTC
svn commit: r1326480 - in /incubator/mrunit: branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/ branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/mapreduce/ trunk/src/main/java/org/apache/hadoop/mrunit/ trunk/src/main/java/org/apache/...

Author: jdonofrio
Date: Mon Apr 16 04:35:05 2012
New Revision: 1326480

URL: http://svn.apache.org/viewvc?rev=1326480&view=rev
Log:
MRUNIT-99: dont force K2 in MapReduceDriver's to be Comparable since Hadoop dont enforce this on the map output key and value classes

Modified:
    incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
    incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java

Modified: incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java?rev=1326480&r1=1326479&r2=1326480&view=diff
==============================================================================
--- incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java (original)
+++ incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java Mon Apr 16 04:35:05 2012
@@ -393,7 +393,7 @@ public class MapReduceDriver<K1, V1, K2,
    * 
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver() {
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver() {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>();
   }
 
@@ -407,7 +407,7 @@ public class MapReduceDriver<K1, V1, K2,
    *          passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
       final Mapper<K1, V1, K2, V2> mapper, final Reducer<K2, V2, K3, V3> reducer) {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>(mapper, reducer);
   }
@@ -424,7 +424,7 @@ public class MapReduceDriver<K1, V1, K2,
    *          passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
       final Mapper<K1, V1, K2, V2> mapper,
       final Reducer<K2, V2, K3, V3> reducer,
       final Reducer<K2, V2, K2, V2> combiner) {

Modified: incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java?rev=1326480&r1=1326479&r2=1326480&view=diff
==============================================================================
--- incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java (original)
+++ incubator/mrunit/branches/mrunit-0.9/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java Mon Apr 16 04:35:05 2012
@@ -391,7 +391,7 @@ public class MapReduceDriver<K1, V1, K2,
    * 
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver() {
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver() {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>();
   }
 
@@ -405,7 +405,7 @@ public class MapReduceDriver<K1, V1, K2,
    *          passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
       final Mapper<K1, V1, K2, V2> mapper, final Reducer<K2, V2, K3, V3> reducer) {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>(mapper, reducer);
   }
@@ -422,7 +422,7 @@ public class MapReduceDriver<K1, V1, K2,
    *          passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
       final Mapper<K1, V1, K2, V2> mapper,
       final Reducer<K2, V2, K3, V3> reducer,
       final Reducer<K2, V2, K2, V2> combiner) {

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java?rev=1326480&r1=1326479&r2=1326480&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java Mon Apr 16 04:35:05 2012
@@ -393,7 +393,7 @@ public class MapReduceDriver<K1, V1, K2,
    * 
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver() {
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver() {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>();
   }
 
@@ -407,7 +407,7 @@ public class MapReduceDriver<K1, V1, K2,
    *          passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
       final Mapper<K1, V1, K2, V2> mapper, final Reducer<K2, V2, K3, V3> reducer) {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>(mapper, reducer);
   }
@@ -424,7 +424,7 @@ public class MapReduceDriver<K1, V1, K2,
    *          passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
       final Mapper<K1, V1, K2, V2> mapper,
       final Reducer<K2, V2, K3, V3> reducer,
       final Reducer<K2, V2, K2, V2> combiner) {

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java?rev=1326480&r1=1326479&r2=1326480&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java Mon Apr 16 04:35:05 2012
@@ -391,7 +391,7 @@ public class MapReduceDriver<K1, V1, K2,
    * 
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver() {
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver() {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>();
   }
 
@@ -405,7 +405,7 @@ public class MapReduceDriver<K1, V1, K2,
    *          passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
       final Mapper<K1, V1, K2, V2> mapper, final Reducer<K2, V2, K3, V3> reducer) {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>(mapper, reducer);
   }
@@ -422,7 +422,7 @@ public class MapReduceDriver<K1, V1, K2,
    *          passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
+  public static <K1, V1, K2, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3> newMapReduceDriver(
       final Mapper<K1, V1, K2, V2> mapper,
       final Reducer<K2, V2, K3, V3> reducer,
       final Reducer<K2, V2, K2, V2> combiner) {