Return-Path: X-Original-To: apmail-incubator-crunch-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-crunch-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0E8E7C3F7 for ; Wed, 22 Aug 2012 06:26:52 +0000 (UTC) Received: (qmail 31129 invoked by uid 500); 22 Aug 2012 06:26:52 -0000 Delivered-To: apmail-incubator-crunch-commits-archive@incubator.apache.org Received: (qmail 30994 invoked by uid 500); 22 Aug 2012 06:26:51 -0000 Mailing-List: contact crunch-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: crunch-dev@incubator.apache.org Delivered-To: mailing list crunch-commits@incubator.apache.org Received: (qmail 30704 invoked by uid 99); 22 Aug 2012 06:26:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Aug 2012 06:26:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 526431ECD7; Wed, 22 Aug 2012 06:26:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jwills@apache.org To: crunch-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [5/9] git commit: Always use the ReflectDatumReader for reflect Avro Message-Id: <20120822062648.526431ECD7@tyr.zones.apache.org> Date: Wed, 22 Aug 2012 06:26:48 +0000 (UTC) Always use the ReflectDatumReader for reflect Avro Use the ReflectDatumReader if reflect data is included in an Avro PType, regardless of whether specific data is included Signed-off-by: Josh Wills Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/dfe70ca9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/dfe70ca9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/dfe70ca9 Branch: refs/heads/master Commit: dfe70ca96f120659b89f6ad961fcbf4340deb942 Parents: 89e58b3 Author: Gabriel Reid Authored: Tue Aug 21 20:38:19 2012 +0200 Committer: Josh Wills Committed: Tue Aug 21 18:54:29 2012 -0700 ---------------------------------------------------------------------- .../crunch/types/avro/AvroGroupedTableType.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/dfe70ca9/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java b/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java index e15581d..ab68e71 100644 --- a/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java +++ b/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java @@ -85,9 +85,8 @@ public class AvroGroupedTableType extends PGroupedTableType { if (att.hasReflect()) { if (att.hasSpecific()) { Avros.checkCombiningSpecificAndReflectionSchemas(); - } else { - conf.setBoolean(AvroJob.MAP_OUTPUT_IS_REFLECT, true); } + conf.setBoolean(AvroJob.MAP_OUTPUT_IS_REFLECT, true); } conf.set(AvroJob.MAP_OUTPUT_SCHEMA, schemaJson); job.setSortComparatorClass(AvroKeyComparator.class); @@ -99,7 +98,8 @@ public class AvroGroupedTableType extends PGroupedTableType { Avros.configureReflectDataFactory(conf); - Collection serializations = job.getConfiguration().getStringCollection("io.serializations"); + Collection serializations = job.getConfiguration().getStringCollection( + "io.serializations"); if (!serializations.contains(SafeAvroSerialization.class.getName())) { serializations.add(SafeAvroSerialization.class.getName()); job.getConfiguration().setStrings("io.serializations", serializations.toArray(new String[0]));