Return-Path: X-Original-To: apmail-crunch-commits-archive@www.apache.org Delivered-To: apmail-crunch-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1768E11C63 for ; Mon, 9 Jun 2014 06:02:53 +0000 (UTC) Received: (qmail 20399 invoked by uid 500); 9 Jun 2014 06:02:53 -0000 Delivered-To: apmail-crunch-commits-archive@crunch.apache.org Received: (qmail 20366 invoked by uid 500); 9 Jun 2014 06:02:53 -0000 Mailing-List: contact commits-help@crunch.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@crunch.apache.org Delivered-To: mailing list commits@crunch.apache.org Received: (qmail 20359 invoked by uid 99); 9 Jun 2014 06:02:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jun 2014 06:02:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC3AD8B262F; Mon, 9 Jun 2014 06:02:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jwills@apache.org To: commits@crunch.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: CRUNCH-409: Scrunch/Avro compatibility improvements Date: Mon, 9 Jun 2014 06:02:52 +0000 (UTC) Repository: crunch Updated Branches: refs/heads/apache-crunch-0.8 a49db45bb -> 83b0dba7c CRUNCH-409: Scrunch/Avro compatibility improvements Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/83b0dba7 Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/83b0dba7 Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/83b0dba7 Branch: refs/heads/apache-crunch-0.8 Commit: 83b0dba7c2e66fde8d1e093c492b41a3217f2ad4 Parents: a49db45 Author: Josh Wills Authored: Mon Jun 2 12:52:55 2014 -0700 Committer: Josh Wills Committed: Sun Jun 8 23:01:05 2014 -0700 ---------------------------------------------------------------------- .../crunch/scrunch/ScalaSafeReflectDatumReader.java | 16 +--------------- .../crunch/scrunch/ScalaSafeReflectDatumWriter.java | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/83b0dba7/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumReader.java ---------------------------------------------------------------------- diff --git a/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumReader.java b/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumReader.java index bbe7305..0db545e 100644 --- a/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumReader.java +++ b/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumReader.java @@ -41,21 +41,7 @@ public class ScalaSafeReflectDatumReader extends ReflectDatumReader { @Override protected Object readArray(Object old, Schema expected, ResolvingDecoder in) throws IOException { - Schema expectedType = expected.getElementType(); - long l = in.readArrayStart(); - if (l > 0) { - Object array = newArray(old, (int) l, expected); - long base = 0; - do { - for (long i = 0; i < l; i++) { - addToArray(array, base + i, read(peekArray(array), expectedType, in)); - } - base += l; - } while ((l = in.arrayNext()) > 0); - return scalaIterableCheck(array, expected); - } else { - return scalaIterableCheck(newArray(old, 0, expected), expected); - } + return scalaIterableCheck(super.readArray(old, expected, in), expected); } @Override http://git-wip-us.apache.org/repos/asf/crunch/blob/83b0dba7/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumWriter.java ---------------------------------------------------------------------- diff --git a/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumWriter.java b/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumWriter.java index 1ac768c..3ecca70 100644 --- a/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumWriter.java +++ b/crunch-scrunch/src/main/java/org/apache/crunch/scrunch/ScalaSafeReflectDatumWriter.java @@ -46,7 +46,7 @@ public class ScalaSafeReflectDatumWriter extends ReflectDatumWriter { if (array instanceof scala.collection.Iterable) { return JavaConversions.asJavaIterable((scala.collection.Iterable) array).iterator(); } - return super.getArrayElements(array); + return (Iterator