You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/08/05 10:38:15 UTC
[1/2] git commit: Fix binding null values inside UDT
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e6602f763 -> 8a3fc0292
Fix binding null values inside UDT
patch by omichallat; reviewed by slebresne for CASSANDRA-7685
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3d8375a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3d8375a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3d8375a
Branch: refs/heads/cassandra-2.1
Commit: a3d8375a2b9da5145fb413bb2314a1142fba6c46
Parents: 95d289b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 5 10:37:14 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 5 10:37:14 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/UserTypes.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d8375a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a8c9ca4..98a0246 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
2.1.0-final
* cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
Merged from 2.0:
* Update java driver (for hadoop) (CASSANDRA-7618)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d8375a/src/java/org/apache/cassandra/cql3/UserTypes.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/UserTypes.java b/src/java/org/apache/cassandra/cql3/UserTypes.java
index bb6e7d0..9d66c16 100644
--- a/src/java/org/apache/cassandra/cql3/UserTypes.java
+++ b/src/java/org/apache/cassandra/cql3/UserTypes.java
@@ -171,7 +171,7 @@ public abstract class UserTypes
buffers[i] = values.get(i).bindAndGet(options);
// Inside UDT values, we must force the serialization of collections to v3 whatever protocol
// version is in use since we're going to store directly that serialized value.
- if (version < 3 && type.fieldType(i).isCollection())
+ if (version < 3 && type.fieldType(i).isCollection() && buffers[i] != null)
buffers[i] = ((CollectionType)type.fieldType(i)).getSerializer().reserializeToV3(buffers[i]);
}
return buffers;
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a3fc029
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a3fc029
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a3fc029
Branch: refs/heads/cassandra-2.1
Commit: 8a3fc0292723038e0af54944c0679c51a500befe
Parents: e6602f7 a3d8375a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 5 10:38:07 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 5 10:38:07 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/UserTypes.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a3fc029/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 590c2fe,98a0246..3588553
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,22 @@@
+2.1.1
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
+
2.1.0-final
* cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
Merged from 2.0:
* Update java driver (for hadoop) (CASSANDRA-7618)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)