Return-Path: 
 <commits-return-443-apmail-gora-commits-archive=gora.apache.org@gora.apache.org>
X-Original-To: apmail-gora-commits-archive@www.apache.org
Delivered-To: apmail-gora-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 146CAF12B
	for <apmail-gora-commits-archive@www.apache.org>;
 Tue,  2 Apr 2013 21:20:24 +0000 (UTC)
Received: (qmail 45077 invoked by uid 500); 2 Apr 2013 21:20:24 -0000
Delivered-To: apmail-gora-commits-archive@gora.apache.org
Received: (qmail 45052 invoked by uid 500); 2 Apr 2013 21:20:23 -0000
Mailing-List: contact commits-help@gora.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@gora.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@gora.apache.org>
List-Post: <mailto:commits@gora.apache.org>
List-Id: <commits.gora.apache.org>
Reply-To: dev@gora.apache.org
Delivered-To: mailing list commits@gora.apache.org
Received: (qmail 45045 invoked by uid 99); 2 Apr 2013 21:20:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Apr 2013 21:20:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Apr 2013 21:20:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A3A7923889BB;
	Tue,  2 Apr 2013 21:20:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1463761 - in /gora/branches/GORA_174/gora-accumulo/src:
 main/java/org/apache/gora/accumulo/store/AccumuloStore.java
 test/resources/gora-accumulo-mapping.xml
Date: Tue, 02 Apr 2013 21:20:02 -0000
To: commits@gora.apache.org
From: alfonsonishikawa@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130402212002.A3A7923889BB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: alfonsonishikawa
Date: Tue Apr  2 21:20:02 2013
New Revision: 1463761

URL: http://svn.apache.org/r1463761
Log:
GORA-216: Patch of Keith Turner for gora-accumulo for unions.

Modified:
    gora/branches/GORA_174/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
    gora/branches/GORA_174/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml

Modified: gora/branches/GORA_174/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
URL: http://svn.apache.org/viewvc/gora/branches/GORA_174/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java?rev=1463761&r1=1463760&r2=1463761&view=diff
==============================================================================
--- gora/branches/GORA_174/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java (original)
+++ gora/branches/GORA_174/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java Tue Apr  2 21:20:02 2013
@@ -94,11 +94,11 @@ import org.apache.gora.store.DataStoreFa
 import org.apache.gora.store.impl.DataStoreBase;
 import org.apache.gora.util.AvroUtils;
 import org.apache.hadoop.io.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * 
@@ -455,6 +455,7 @@ public class AccumuloStore<K,T extends P
 
           break;
         case RECORD:
+        case UNION:
           SpecificDatumReader reader = new SpecificDatumReader(field.schema());
           byte[] val = entry.getValue().get();
           // TODO reuse decoder
@@ -578,6 +579,7 @@ public class AccumuloStore<K,T extends P
             }
             break;
           case RECORD:
+          case UNION:
             SpecificDatumWriter writer = new SpecificDatumWriter(field.schema());
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             BinaryEncoder encoder = new BinaryEncoder(os);

Modified: gora/branches/GORA_174/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml
URL: http://svn.apache.org/viewvc/gora/branches/GORA_174/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml?rev=1463761&r1=1463760&r2=1463761&view=diff
==============================================================================
--- gora/branches/GORA_174/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml (original)
+++ gora/branches/GORA_174/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml Tue Apr  2 21:20:02 2013
@@ -38,6 +38,8 @@
     <field name="dateOfBirth" family="info" qualifier="db"/>
     <field name="ssn" family="info" qualifier="sn"/>
     <field name="salary" family="info" qualifier="sl"/>
+    <field name="boss" family="info" qualifier="bs"/>
+    <field name="webpage" family="info" qualifier="wp"/>
   </class>
   
   <class name="org.apache.gora.examples.generated.WebPage" keyClass="java.lang.String" table="WebPage">
@@ -51,4 +53,4 @@
   <class name="org.apache.gora.examples.generated.TokenDatum" keyClass="java.lang.String">
     <field name="count" family="common" qualifier="count"/>
   </class>  
-</gora-orm>  
\ No newline at end of file
+</gora-orm>