Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 89a8f4a7e -> a23960e24
Make FROZEN and TUPLE unreserved keywords Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-9047 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a23960e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a23960e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a23960e2 Branch: refs/heads/cassandra-2.1 Commit: a23960e24a184bd0a01bf4c2bd25323ff9200b6e Parents: 89a8f4a Author: Tyler Hobbs <[email protected]> Authored: Fri Mar 27 15:51:41 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Mar 27 15:51:41 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a23960e2/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 64fa75f..8854261 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.4 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) * Avoid overwriting index summaries for sstables with an older format that does not support downsampling; rebuild summaries on startup when this http://git-wip-us.apache.org/repos/asf/cassandra/blob/a23960e2/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 a1545d3..b7d1b09 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -1234,6 +1234,8 @@ basic_unreserved_keyword returns [String str] | K_DISTINCT | K_CONTAINS | K_STATIC + | K_FROZEN + | K_TUPLE ) { $str = $k.text; } ;
