You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by ja...@apache.org on 2015/03/29 03:12:35 UTC

mrunit git commit: MRUNIT-221: Wrong Generic for setKeyGroupingComparator/setKeyOrderComparator in MultipleInputsMapReduceDriverBase (Contributed by Mathias Rüdiger via Jason Tedor)

Repository: mrunit
Updated Branches:
  refs/heads/trunk c68c9e45a -> 98d08f2d1


MRUNIT-221: Wrong Generic for setKeyGroupingComparator/setKeyOrderComparator in MultipleInputsMapReduceDriverBase (Contributed by Mathias Rüdiger via Jason Tedor)


Project: http://git-wip-us.apache.org/repos/asf/mrunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/mrunit/commit/98d08f2d
Tree: http://git-wip-us.apache.org/repos/asf/mrunit/tree/98d08f2d
Diff: http://git-wip-us.apache.org/repos/asf/mrunit/diff/98d08f2d

Branch: refs/heads/trunk
Commit: 98d08f2d11165c39bf37c9d9a7d7489ec3e60c13
Parents: c68c9e4
Author: Jason Tedor <ja...@apache.org>
Authored: Sat Mar 28 21:05:20 2015 -0400
Committer: Jason Tedor <ja...@apache.org>
Committed: Sat Mar 28 21:05:20 2015 -0400

----------------------------------------------------------------------
 .../internal/driver/MultipleInputsMapReduceDriverBase.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mrunit/blob/98d08f2d/src/main/java/org/apache/hadoop/mrunit/internal/driver/MultipleInputsMapReduceDriverBase.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/driver/MultipleInputsMapReduceDriverBase.java b/src/main/java/org/apache/hadoop/mrunit/internal/driver/MultipleInputsMapReduceDriverBase.java
index 726aaeb..bac9a80 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/driver/MultipleInputsMapReduceDriverBase.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/driver/MultipleInputsMapReduceDriverBase.java
@@ -113,7 +113,7 @@ public abstract class MultipleInputsMapReduceDriverBase<M, K1, V1, K2, V2, T ext
    */
   @SuppressWarnings("unchecked")
   public void setKeyGroupingComparator(
-      final RawComparator<K2> groupingComparator) {
+      final RawComparator<K1> groupingComparator) {
     keyGroupComparator = ReflectionUtils.newInstance(
         groupingComparator.getClass(), getConfiguration());
   }
@@ -126,7 +126,7 @@ public abstract class MultipleInputsMapReduceDriverBase<M, K1, V1, K2, V2, T ext
    *          Comparator to use in the shuffle stage for key grouping
    * @return this
    */
-  public T withKeyGroupingComparator(final RawComparator<K2> groupingComparator) {
+  public T withKeyGroupingComparator(final RawComparator<K1> groupingComparator) {
     setKeyGroupingComparator(groupingComparator);
     return thisAsMapReduceDriver();
   }
@@ -149,7 +149,7 @@ public abstract class MultipleInputsMapReduceDriverBase<M, K1, V1, K2, V2, T ext
    * @param orderComparator
    */
   @SuppressWarnings("unchecked")
-  public void setKeyOrderComparator(final RawComparator<K2> orderComparator) {
+  public void setKeyOrderComparator(final RawComparator<K1> orderComparator) {
     keyValueOrderComparator = ReflectionUtils.newInstance(
         orderComparator.getClass(), getConfiguration());
   }
@@ -162,7 +162,7 @@ public abstract class MultipleInputsMapReduceDriverBase<M, K1, V1, K2, V2, T ext
    *          Comparator to use in the shuffle stage for key value ordering
    * @return this
    */
-  public T withKeyOrderComparator(final RawComparator<K2> orderComparator) {
+  public T withKeyOrderComparator(final RawComparator<K1> orderComparator) {
     setKeyOrderComparator(orderComparator);
     return thisAsMapReduceDriver();
   }