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/09/12 21:21:17 UTC

git commit: Fix parsing of consistency ALL in CQL3

Updated Branches:
  refs/heads/trunk 1e126dada -> 8edf6a619


Fix parsing of consistency ALL in CQL3

patch by slebresne; reviewed by xedin for CASSANDRA-4659


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8edf6a61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8edf6a61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8edf6a61

Branch: refs/heads/trunk
Commit: 8edf6a6192ca201e5c2ef84452a21b8de2b953df
Parents: 1e126da
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 12 21:20:36 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 12 21:20:36 2012 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/Cql.g |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8edf6a61/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 79c5b9f..01dbafd 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -752,11 +752,10 @@ K_UPDATE:      U P D A T E;
 K_WITH:        W I T H;
 K_LIMIT:       L I M I T;
 K_USING:       U S I N G;
-K_ALL:         A L L;
 K_CONSISTENCY: C O N S I S T E N C Y;
 K_LEVEL:       ( O N E
                | Q U O R U M
-               | K_ALL
+               | A L L
                | A N Y
                | L O C A L '_' Q U O R U M
                | E A C H '_' Q U O R U M