Updated Branches: refs/heads/cassandra-2.0 27f4ea2bf -> 31a9a2fd1 refs/heads/trunk ec308e66b -> db8294932
Disallow empty column names in cql patch by dbrosius reviewed by slebresne for cassandra-6136 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27f4ea2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27f4ea2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27f4ea2b Branch: refs/heads/trunk Commit: 27f4ea2bfd8831ee147ee1ed7a59be9c3308a558 Parents: b3647d9 Author: Dave Brosius <dbros...@apache.org> Authored: Thu Oct 3 10:29:04 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Thu Oct 3 10:29:04 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27f4ea2b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 994e8c3..e08e5b6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -15,6 +15,7 @@ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) * Delete can potentially be skipped in batch (CASSANDRA-6115) * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) Merged from 1.2: * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) * Tracing should log write failure rather than raw exceptions (CASSANDRA-6133) http://git-wip-us.apache.org/repos/asf/cassandra/blob/27f4ea2b/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g index 17afb00..ed950da 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -1096,7 +1096,7 @@ STRING_LITERAL QUOTED_NAME @init{ StringBuilder b = new StringBuilder(); } @after{ setText(b.toString()); } - : '\"' (c=~('\"') { b.appendCodePoint(c); } | '\"' '\"' { b.appendCodePoint('\"'); })* '\"' + : '\"' (c=~('\"') { b.appendCodePoint(c); } | '\"' '\"' { b.appendCodePoint('\"'); })+ '\"' ; fragment DIGIT