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 AF2E393AE for ; Thu, 5 Jan 2012 20:01:33 +0000 (UTC) Received: (qmail 53084 invoked by uid 500); 5 Jan 2012 20:01:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 52981 invoked by uid 500); 5 Jan 2012 20:01:32 -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 52964 invoked by uid 99); 5 Jan 2012 20:01:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jan 2012 20:01:32 +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; Thu, 05 Jan 2012 20:01:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AEC353175F5; Thu, 5 Jan 2012 20:00:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [16/50] [abbrv] git commit: TimeUUID support in CassandraStorage. Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-3327 Message-Id: <20120105200029.AEC353175F5@tyr.zones.apache.org> Date: Thu, 5 Jan 2012 20:00:29 +0000 (UTC) TimeUUID support in CassandraStorage. Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-3327 git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8@1220926 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cdfaab7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cdfaab7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cdfaab7 Branch: refs/heads/trunk Commit: 5cdfaab72c6c8a2a9fab0d1a97fd1cdeafd6c2df Parents: 0860058 Author: Brandon Williams Authored: Mon Dec 19 20:11:40 2011 +0000 Committer: Brandon Williams Committed: Mon Dec 19 20:11:40 2011 +0000 ---------------------------------------------------------------------- .../cassandra/hadoop/pig/CassandraStorage.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cdfaab7/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --git a/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index f3510b0..fd0959d 100644 --- a/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@ -27,6 +27,7 @@ import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.db.marshal.TypeParser; import org.apache.cassandra.thrift.*; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.utils.UUIDGen; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -171,6 +172,8 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo pair.set(position, ((BigInteger) value).intValue()); else if (value instanceof ByteBuffer) pair.set(position, new DataByteArray(ByteBufferUtil.getArray((ByteBuffer) value))); + else if (value instanceof UUID) + pair.set(position, new DataByteArray(UUIDGen.decompose((java.util.UUID) value))); else pair.set(position, value); }