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 2015/11/26 10:43:05 UTC
[1/4] cassandra git commit: Refuse counters as map keys
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 5fd65f3b7 -> b7ead2b33
Refuse counters as map keys
patch by michaeledge; reviewed by slebresne for CASSANDRA-10760
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cdf0485b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cdf0485b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cdf0485b
Branch: refs/heads/cassandra-3.1
Commit: cdf0485b23de6d2b746393237da3cfea9d0dc4b9
Parents: 3d99418
Author: Michael Edge <ed...@gmail.com>
Authored: Thu Nov 26 10:36:33 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Nov 26 10:36:33 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cdf0485b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3ede9b7..7978a56 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Properly reject counters as map keys (CASSANDRA-10760)
* Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cdf0485b/src/java/org/apache/cassandra/cql3/CQL3Type.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java b/src/java/org/apache/cassandra/cql3/CQL3Type.java
index b656de8..db7fa5c 100644
--- a/src/java/org/apache/cassandra/cql3/CQL3Type.java
+++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java
@@ -433,6 +433,8 @@ public interface CQL3Type
if (keys != null)
{
+ if (keys.isCounter())
+ throw new InvalidRequestException("Counters are not allowed inside collections: " + this);
if (!frozen && keys.supportsFreezing() && !keys.frozen)
throw new InvalidRequestException("Non-frozen collections are not allowed inside collections: " + this);
}
[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
is merge is necessary,
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64a3bfd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3bfd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64a3bfd2
Branch: refs/heads/cassandra-3.1
Commit: 64a3bfd29290f53db1e730e955bd401bc68310e3
Parents: 2cbd776 8bfdd65
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Nov 26 10:42:22 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Nov 26 10:42:22 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3bfd2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bd7006e,237c251..04cda25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,9 -4,19 +14,10 @@@ Merged from 2.2
* Fix SimpleDateType type compatibility (CASSANDRA-10027)
* (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
- * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
- * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
- * Expose phi values from failure detector via JMX and tweak debug
- and trace logging (CASSANDRA-9526)
- * Fix RangeNamesQueryPager (CASSANDRA-10509)
- * Deprecate Pig support (CASSANDRA-10542)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
Merged from 2.1:
+ * Properly reject counters as map keys (CASSANDRA-10760)
* Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
- * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3bfd2/src/java/org/apache/cassandra/cql3/CQL3Type.java
----------------------------------------------------------------------
[2/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bfdd65c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfdd65c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bfdd65c
Branch: refs/heads/cassandra-3.1
Commit: 8bfdd65c0d0c3013b00902a64e591d4aaeaea4dd
Parents: 31be903 cdf0485
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Nov 26 10:40:49 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Nov 26 10:40:49 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfdd65c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b32c2b,7978a56..237c251
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,8 +1,21 @@@
-2.1.12
+2.2.4
+ * Fix JSON update with prepared statements (CASSANDRA-10631)
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
+ * Properly reject counters as map keys (CASSANDRA-10760)
* Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
- * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfdd65c/src/java/org/apache/cassandra/cql3/CQL3Type.java
----------------------------------------------------------------------
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7ead2b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ead2b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ead2b3
Branch: refs/heads/cassandra-3.1
Commit: b7ead2b330e8b3b3a70eaf36895fb1b7f1c6f1b2
Parents: 5fd65f3 64a3bfd
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Nov 26 10:42:50 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Nov 26 10:42:50 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ead2b3/CHANGES.txt
----------------------------------------------------------------------