crunch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwi...@apache.org
Subject git commit: CRUNCH-309: Fixed Cogroup4 ArrayIndexOutOfBoundsException and corresponding test. Contributed by Nathan Langlois.
Date Wed, 04 Dec 2013 17:46:52 GMT
Updated Branches:
  refs/heads/master 10bf70489 -> 22965cf87


CRUNCH-309: Fixed Cogroup4 ArrayIndexOutOfBoundsException and corresponding test. Contributed
by Nathan Langlois.

Signed-off-by: Josh Wills <jwills@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/22965cf8
Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/22965cf8
Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/22965cf8

Branch: refs/heads/master
Commit: 22965cf87e2793ca79048ac48adf7b41dda23ea2
Parents: 10bf704
Author: Nate Langlois <nathaniel.langlois@cerner.com>
Authored: Tue Dec 3 18:36:27 2013 -0600
Committer: Josh Wills <jwills@apache.org>
Committed: Wed Dec 4 09:44:04 2013 -0800

----------------------------------------------------------------------
 crunch-core/src/it/java/org/apache/crunch/lib/CogroupIT.java | 4 ++--
 crunch-core/src/main/java/org/apache/crunch/lib/Cogroup.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/crunch/blob/22965cf8/crunch-core/src/it/java/org/apache/crunch/lib/CogroupIT.java
----------------------------------------------------------------------
diff --git a/crunch-core/src/it/java/org/apache/crunch/lib/CogroupIT.java b/crunch-core/src/it/java/org/apache/crunch/lib/CogroupIT.java
index 16c4c69..1a0bfe9 100644
--- a/crunch-core/src/it/java/org/apache/crunch/lib/CogroupIT.java
+++ b/crunch-core/src/it/java/org/apache/crunch/lib/CogroupIT.java
@@ -94,12 +94,12 @@ public class CogroupIT {
   
   @Test
   public void testCogroup4Writables() {
-    runCogroup3(WritableTypeFamily.getInstance());
+    runCogroup4(WritableTypeFamily.getInstance());
   }
 
   @Test
   public void testCogroup4Avro() {
-    runCogroup3(AvroTypeFamily.getInstance());
+    runCogroup4(AvroTypeFamily.getInstance());
   }
   
   public void runCogroup(PTypeFamily ptf) {

http://git-wip-us.apache.org/repos/asf/crunch/blob/22965cf8/crunch-core/src/main/java/org/apache/crunch/lib/Cogroup.java
----------------------------------------------------------------------
diff --git a/crunch-core/src/main/java/org/apache/crunch/lib/Cogroup.java b/crunch-core/src/main/java/org/apache/crunch/lib/Cogroup.java
index 514f46f..9efcb5e 100644
--- a/crunch-core/src/main/java/org/apache/crunch/lib/Cogroup.java
+++ b/crunch-core/src/main/java/org/apache/crunch/lib/Cogroup.java
@@ -159,7 +159,7 @@ public class Cogroup {
           }
         },
         numReducers,
-        first, second, third);
+        first, second, third, fourth);
   }
   
   /**


Mime
View raw message