Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 93985200B68 for ; Fri, 19 Aug 2016 11:16:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 923F2160ABC; Fri, 19 Aug 2016 09:16:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D8F12160A8E for ; Fri, 19 Aug 2016 11:16:15 +0200 (CEST) Received: (qmail 62671 invoked by uid 500); 19 Aug 2016 09:16:15 -0000 Mailing-List: contact commits-help@gora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@gora.apache.org Delivered-To: mailing list commits@gora.apache.org Received: (qmail 62662 invoked by uid 99); 19 Aug 2016 09:16:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Aug 2016 09:16:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB7DDE00D6; Fri, 19 Aug 2016 09:16:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lewismc@apache.org To: commits@gora.apache.org Date: Fri, 19 Aug 2016 09:16:14 -0000 Message-Id: <9ef189e553c243689cb054a4a00701a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] gora git commit: GORA-487 Edited AccumuloStore.java duplicate code lines archived-at: Fri, 19 Aug 2016 09:16:16 -0000 Repository: gora Updated Branches: refs/heads/master 61c25fefb -> 4192c8751 GORA-487 Edited AccumuloStore.java duplicate code lines Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/6428e5d0 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/6428e5d0 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/6428e5d0 Branch: refs/heads/master Commit: 6428e5d0d82aec4dfc8511f9e9d9ff5477b4dc31 Parents: 61c25fe Author: cihad guzel Authored: Wed Aug 17 22:45:50 2016 +0300 Committer: cihad guzel Committed: Thu Aug 18 02:10:20 2016 +0300 ---------------------------------------------------------------------- .../org/apache/gora/accumulo/store/AccumuloStore.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/6428e5d0/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java ---------------------------------------------------------------------- diff --git a/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java b/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java index 2a8af02..18145ae 100644 --- a/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java +++ b/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java @@ -97,6 +97,7 @@ import org.apache.gora.store.DataStoreFactory; import org.apache.gora.store.impl.DataStoreBase; import org.apache.gora.util.AvroUtils; import org.apache.gora.util.GoraException; +import org.apache.gora.util.IOUtils; import org.apache.hadoop.io.Text; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -690,12 +691,9 @@ public class AccumuloStore extends DataStoreBase writer = new SpecificDatumWriter<>(field.schema()); - ByteArrayOutputStream os = new ByteArrayOutputStream(); - org.apache.avro.io.BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(os, null); - writer.write(o, encoder); - encoder.flush(); - m.put(col.getFirst(), col.getSecond(), new Value(os.toByteArray())); + final SpecificDatumWriter writer = new SpecificDatumWriter<>(field.schema()); + final byte[] byteData = IOUtils.serialize(writer,o); + m.put(col.getFirst(), col.getSecond(), new Value(byteData)); count++; break; default: