You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/09 14:38:37 UTC
git commit: Merge 3327 from 0.8
Updated Branches:
refs/heads/cassandra-1.1 db3f9083a -> 0183dc0b3
Merge 3327 from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1220934 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/0183dc0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0183dc0b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0183dc0b
Branch: refs/heads/cassandra-1.1
Commit: 0183dc0b36e684082832de43a21b3dc0a9716d48
Parents: db3f908
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 19 20:26:47 2011 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 9 07:29:13 2012 -0600
----------------------------------------------------------------------
.../cassandra/hadoop/pig/CassandraStorage.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0183dc0b/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 13a3857..8f60f4a 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -28,6 +28,7 @@ import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Hex;
+import org.apache.cassandra.utils.UUIDGen;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -181,6 +182,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);
}