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 2013/10/25 18:13:18 UTC
[1/6] git commit: Handle null correctly in CqlStorage Patch by Alex
Liu, reviewed by brandonwilliams for CASSANDRA-6180
Updated Branches:
refs/heads/cassandra-1.2 dcbf35c55 -> cb506b793
refs/heads/cassandra-2.0 9385cfded -> 2f248b3f9
refs/heads/trunk 8d1bb0753 -> 0dccea4f3
Handle null correctly in CqlStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb506b79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb506b79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb506b79
Branch: refs/heads/cassandra-1.2
Commit: cb506b793ced3563e5671f0ad5b92c4d8655d45d
Parents: dcbf35c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 25 11:10:09 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 25 11:10:09 2013 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/pig/AbstractCassandraStorage.java | 4 +++-
.../org/apache/cassandra/hadoop/pig/CassandraStorage.java | 5 +++++
src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 ++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
index a02e309..98b3a6c 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
@@ -403,11 +403,13 @@ public abstract class AbstractCassandraStorage extends LoadFunc implements Store
// we don't care about types, they all get casted to ByteBuffers
}
+ protected abstract ByteBuffer nullToBB();
+
/** convert object to ByteBuffer */
protected ByteBuffer objToBB(Object o)
{
if (o == null)
- return (ByteBuffer)o;
+ return nullToBB();
if (o instanceof java.lang.String)
return ByteBuffer.wrap(new DataByteArray((String)o).get());
if (o instanceof Integer)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/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 0512a37..853a052 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -824,5 +824,10 @@ public class CassandraStorage extends AbstractCassandraStorage
"[&init_address=<host>][&rpc_port=<port>]]': " + e.getMessage());
}
}
+
+ public ByteBuffer nullToBB()
+ {
+ return (ByteBuffer) null;
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 0d01383..7b31565 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@ -710,5 +710,13 @@ public class CqlStorage extends AbstractCassandraStorage
return validator.getString(validator.decompose(obj));
return obj;
}
+
+ /**
+ * Thrift API can't handle null, so use empty byte array
+ */
+ public ByteBuffer nullToBB()
+ {
+ return ByteBuffer.wrap(new byte[0]);
+ }
}
[3/6] git commit: Handle null correctly in CqlStorage Patch by Alex
Liu, reviewed by brandonwilliams for CASSANDRA-6180
Posted by br...@apache.org.
Handle null correctly in CqlStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb506b79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb506b79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb506b79
Branch: refs/heads/trunk
Commit: cb506b793ced3563e5671f0ad5b92c4d8655d45d
Parents: dcbf35c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 25 11:10:09 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 25 11:10:09 2013 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/pig/AbstractCassandraStorage.java | 4 +++-
.../org/apache/cassandra/hadoop/pig/CassandraStorage.java | 5 +++++
src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 ++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
index a02e309..98b3a6c 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
@@ -403,11 +403,13 @@ public abstract class AbstractCassandraStorage extends LoadFunc implements Store
// we don't care about types, they all get casted to ByteBuffers
}
+ protected abstract ByteBuffer nullToBB();
+
/** convert object to ByteBuffer */
protected ByteBuffer objToBB(Object o)
{
if (o == null)
- return (ByteBuffer)o;
+ return nullToBB();
if (o instanceof java.lang.String)
return ByteBuffer.wrap(new DataByteArray((String)o).get());
if (o instanceof Integer)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/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 0512a37..853a052 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -824,5 +824,10 @@ public class CassandraStorage extends AbstractCassandraStorage
"[&init_address=<host>][&rpc_port=<port>]]': " + e.getMessage());
}
}
+
+ public ByteBuffer nullToBB()
+ {
+ return (ByteBuffer) null;
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 0d01383..7b31565 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@ -710,5 +710,13 @@ public class CqlStorage extends AbstractCassandraStorage
return validator.getString(validator.decompose(obj));
return obj;
}
+
+ /**
+ * Thrift API can't handle null, so use empty byte array
+ */
+ public ByteBuffer nullToBB()
+ {
+ return ByteBuffer.wrap(new byte[0]);
+ }
}
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f248b3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f248b3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f248b3f
Branch: refs/heads/cassandra-2.0
Commit: 2f248b3f905380347cf45652462d1fc5989ee8d0
Parents: 9385cfd cb506b7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 25 11:11:31 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 25 11:11:31 2013 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/pig/AbstractCassandraStorage.java | 4 +++-
.../org/apache/cassandra/hadoop/pig/CassandraStorage.java | 6 +++++-
src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 ++++++++
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0dccea4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dccea4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0dccea4f
Branch: refs/heads/trunk
Commit: 0dccea4f3600ea29bf4e146ed2c2a49b615187c3
Parents: 8d1bb07 2f248b3
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 25 11:11:41 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 25 11:11:41 2013 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/pig/AbstractCassandraStorage.java | 4 +++-
.../org/apache/cassandra/hadoop/pig/CassandraStorage.java | 6 +++++-
src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 ++++++++
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0dccea4f/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f248b3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f248b3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f248b3f
Branch: refs/heads/trunk
Commit: 2f248b3f905380347cf45652462d1fc5989ee8d0
Parents: 9385cfd cb506b7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 25 11:11:31 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 25 11:11:31 2013 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/pig/AbstractCassandraStorage.java | 4 +++-
.../org/apache/cassandra/hadoop/pig/CassandraStorage.java | 6 +++++-
src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 ++++++++
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f248b3f/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
[2/6] git commit: Handle null correctly in CqlStorage Patch by Alex
Liu, reviewed by brandonwilliams for CASSANDRA-6180
Posted by br...@apache.org.
Handle null correctly in CqlStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb506b79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb506b79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb506b79
Branch: refs/heads/cassandra-2.0
Commit: cb506b793ced3563e5671f0ad5b92c4d8655d45d
Parents: dcbf35c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 25 11:10:09 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 25 11:10:09 2013 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/pig/AbstractCassandraStorage.java | 4 +++-
.../org/apache/cassandra/hadoop/pig/CassandraStorage.java | 5 +++++
src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 ++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
index a02e309..98b3a6c 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
@@ -403,11 +403,13 @@ public abstract class AbstractCassandraStorage extends LoadFunc implements Store
// we don't care about types, they all get casted to ByteBuffers
}
+ protected abstract ByteBuffer nullToBB();
+
/** convert object to ByteBuffer */
protected ByteBuffer objToBB(Object o)
{
if (o == null)
- return (ByteBuffer)o;
+ return nullToBB();
if (o instanceof java.lang.String)
return ByteBuffer.wrap(new DataByteArray((String)o).get());
if (o instanceof Integer)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/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 0512a37..853a052 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -824,5 +824,10 @@ public class CassandraStorage extends AbstractCassandraStorage
"[&init_address=<host>][&rpc_port=<port>]]': " + e.getMessage());
}
}
+
+ public ByteBuffer nullToBB()
+ {
+ return (ByteBuffer) null;
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb506b79/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 0d01383..7b31565 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@ -710,5 +710,13 @@ public class CqlStorage extends AbstractCassandraStorage
return validator.getString(validator.decompose(obj));
return obj;
}
+
+ /**
+ * Thrift API can't handle null, so use empty byte array
+ */
+ public ByteBuffer nullToBB()
+ {
+ return ByteBuffer.wrap(new byte[0]);
+ }
}