From cdf0485b23de6d2b746393237da3cfea9d0dc4b9 Mon Sep 17 00:00:00 2001 From: Michael Edge Date: Thu, 26 Nov 2015 10:36:33 +0100 Subject: [PATCH] Refuse counters as map keys patch by michaeledge; reviewed by slebresne for CASSANDRA-10760 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 3ede9b7fa3..7978a56dd0 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) diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java b/src/java/org/apache/cassandra/cql3/CQL3Type.java index b656de8a21..db7fa5c654 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); }