Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 5773A9558 for ; Tue, 14 Feb 2012 18:53:16 +0000 (UTC) Received: (qmail 66914 invoked by uid 500); 14 Feb 2012 18:53:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 66888 invoked by uid 500); 14 Feb 2012 18:53:16 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 66876 invoked by uid 99); 14 Feb 2012 18:53:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2012 18:53:16 +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.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2012 18:53:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E263331FE79; Tue, 14 Feb 2012 18:52:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vijay@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [20/50] git commit: Pig's objToBB should handle all types. Patch by brandonwilliams, reviewed by xedin for CASSANDRA-3886 Message-Id: <20120214185213.E263331FE79@tyr.zones.apache.org> Date: Tue, 14 Feb 2012 18:52:13 +0000 (UTC) Pig's objToBB should handle all types. Patch by brandonwilliams, reviewed by xedin for CASSANDRA-3886 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcad0688 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcad0688 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcad0688 Branch: refs/heads/cassandra-1.0 Commit: bcad06883dc599c77393bc4eb2807be9da3d294a Parents: c49a149 Author: Brandon Williams Authored: Fri Feb 10 10:07:53 2012 -0600 Committer: Jonathan Ellis Committed: Mon Feb 13 15:43:03 2012 -0600 ---------------------------------------------------------------------- .../cassandra/hadoop/pig/CassandraStorage.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcad0688/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index 9c6dd30..ebd118c 100644 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@ -561,8 +561,18 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo if (o == null) return (ByteBuffer)o; if (o instanceof java.lang.String) - o = new DataByteArray((String)o); - return ByteBuffer.wrap(((DataByteArray) o).get()); + return new ByteBuffer.wrap(DataByteArray((String)o).get()); + if (o instanceof Integer) + return IntegerType.instance.decompose((BigInteger)o); + if (o instanceof Long) + return LongType.instance.decompose((Long)o); + if (o instanceof Float) + return FloatType.instance.decompose((Float)o); + if (o instanceof Double) + return DoubleType.instance.decompose((Double)o); + if (o instanceof UUID) + return ByteBuffer.wrap(UUIDGen.decompose((UUID) o)); + return null; } public void putNext(Tuple t) throws ExecException, IOException