cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Minor CQL3 doc fixes
Date Wed, 02 Jan 2013 15:23:58 GMT
Updated Branches:
  refs/heads/cassandra-1.2 119c726f4 -> 0804de9d4


Minor CQL3 doc fixes


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

Branch: refs/heads/cassandra-1.2
Commit: 0804de9d465a7018326054ee5f26e7b5a04fe6a0
Parents: 119c726
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Jan 2 16:23:48 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Jan 2 16:23:48 2013 +0100

----------------------------------------------------------------------
 doc/cql3/CQL.textile |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0804de9d/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 452407b..cd2783d 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -202,8 +202,11 @@ bc(syntax)..
 <column-definition> ::= <identifier> <type> ( PRIMARY KEY )?
                       | PRIMARY KEY '(' <partition-key> ( ',' <identifier> )*
')'
 
+<partition-key> ::= <partition-key>
+                  | '(' <partition-key> ( ',' <identifier> )* ')'
+
 <partition-key> ::= <identifier>
-                  | '(' <identifier> ( ',' <identifier> )* ')'
+                  | '(' <identifier> (',' <identifier> )* ')'
 
 <option> ::= <property>
            | COMPACT STORAGE
@@ -847,13 +850,14 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved
keywo
 
 |_. Keyword      |_. Reserved? |
 | @ADD@          | yes |
-| @ALL@          | yes |
+| @ALL@          | no  |
 | @ALTER@        | yes |
 | @AND@          | yes |
 | @ANY@          | yes |
 | @APPLY@        | yes |
 | @ASC@          | yes |
 | @ASCII@        | no  |
+| @AUTHORIZE@    | yes |
 | @BATCH@        | yes |
 | @BEGIN@        | yes |
 | @BIGINT@       | no  |
@@ -875,6 +879,7 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved
keywo
 | @EACH_QUORUM@  | yes |
 | @FLOAT@        | no  |
 | @FROM@         | yes |
+| @GRANT@        | yes |
 | @IN@           | yes |
 | @INDEX@        | yes |
 | @INSERT@       | yes |
@@ -885,15 +890,24 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved
keywo
 | @LEVEL@        | no  |
 | @LIMIT@        | yes |
 | @LOCAL_QUORUM@ | yes |
+| @MODIFY@       | yes |
+| @NORECURSIVE@  | yes |
+| @NOSUPERUSER@  | no  |
+| @OF@           | yes |
 | @ON@           | yes |
 | @ONE@          | yes |
 | @ORDER@        | yes |
+| @PASSWORD@     | no  |
+| @PERMISSION@   | no  |
+| @PERMISSIONS@  | no  |
 | @PRIMARY@      | yes |
 | @QUORUM@       | yes |
+| @REVOKE@       | yes |
 | @SCHEMA@       | yes |
 | @SELECT@       | yes |
 | @SET@          | yes |
 | @STORAGE@      | no  |
+| @SUPERUSER@    | no  |
 | @TABLE@        | yes |
 | @TEXT@         | no  |
 | @TIMESTAMP@    | no  |
@@ -906,6 +920,8 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved
keywo
 | @TYPE@         | no  |
 | @UPDATE@       | yes |
 | @USE@          | yes |
+| @USER@         | no  |
+| @USERS@        | no  |
 | @USING@        | yes |
 | @UUID@         | no  |
 | @VALUES@       | no  |
@@ -916,6 +932,8 @@ CQL distinguishes between _reserved_ and _non-reserved_ keywords. Reserved
keywo
 | @WRITETIME@    | no  |
 
 
+
+
 h2. Versioning
 
 Versioning of the CQL language adheres to the "Semantic Versioning":http://semver.org guidelines.
Versions take the form X.Y.Z where X, Y, and Z are integer values representing major, minor,
and patch level respectively. There is no correlation between Cassandra release versions and
the CQL language version.


Mime
View raw message