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 2012/04/17 09:27:00 UTC
[3/5] git commit: Support CL.TWO and CL.THREE in CQL
Support CL.TWO and CL.THREE in CQL
patch by mdennis; reviewed by slebresne for CASSANDRA-4156
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9895c88d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9895c88d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9895c88d
Branch: refs/heads/cassandra-1.1
Commit: 9895c88de398edfdce4b5cf3bb390e3a2a9dc187
Parents: 5b57673
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Apr 17 09:13:49 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Apr 17 09:13:49 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql/Cql.g | 2 ++
src/java/org/apache/cassandra/cql3/Cql.g | 2 ++
3 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9895c88d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b2f33ed..f11af3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
1.1-dev
* Allow KS and CF names up to 48 characters (CASSANDRA-4157)
+ * Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156)
1.1-rc1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9895c88d/src/java/org/apache/cassandra/cql/Cql.g
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/Cql.g b/src/java/org/apache/cassandra/cql/Cql.g
index b6d4545..270a48b 100644
--- a/src/java/org/apache/cassandra/cql/Cql.g
+++ b/src/java/org/apache/cassandra/cql/Cql.g
@@ -518,6 +518,8 @@ K_LEVEL: ( O N E
| A N Y
| L O C A L '_' Q U O R U M
| E A C H '_' Q U O R U M
+ | T W O
+ | T H R E E
)
;
K_USE: U S E;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9895c88d/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 ec6e8e0..cb15272 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -505,6 +505,8 @@ K_LEVEL: ( O N E
| A N Y
| L O C A L '_' Q U O R U M
| E A C H '_' Q U O R U M
+ | T W O
+ | T H R E E
)
;
K_USE: U S E;