Changes withElement definition to be closer to CQL3 specification (#4296

)

* Changes withElement definition to be closer to CQL3 specification.

This PR adds support for two things:

1. Specifying order of more than one clustering keys, and
2. Allowing for additional table options after `WITH CLUSTERING ORDER`.

Both are allowed in CQL3, see the relevant section of the spec:
https://cassandra.apache.org/doc/stable/cassandra/cql/ddl.html#create-table-statement

This does not add support for `COMPACT STORAGE`, which is also allowed by the spec.
Adding it as part of this PR would greatly complicate the grammar and break backwards
compatibility. Someone would have to think more carefully about how to roll out such
a change.

* Added support for the COMPACT STORAGE table option.

* Renamed test table

cql3/CqlParser.g4

@@ -391,15 +391,17 @@ createTable
     ;
 
 withElement
-    : kwWith tableOptions? clusteringOrder?
+    : kwWith tableOptions
     ;
 
-clusteringOrder
-    : kwClustering kwOrder kwBy syntaxBracketLr column orderDirection? syntaxBracketRr
+tableOptions
+    : kwCompact kwStorage (kwAnd tableOptions)?
+    | clusteringOrder (kwAnd tableOptions)?
+    | tableOptionItem (kwAnd tableOptionItem)*
     ;
 
-tableOptions
-    : tableOptionItem (kwAnd tableOptionItem)*
+clusteringOrder
+    : kwClustering kwOrder kwBy syntaxBracketLr (column orderDirection?) (syntaxComma column orderDirection?)* syntaxBracketRr
     ;
 
 tableOptionItem
@@ -1340,4 +1342,4 @@ syntaxComma
 
 syntaxColon
     : COLON
-    ;
+    ;

cql3/examples/tableOptions.cql

@@ -0,0 +1,9 @@
+CREATE TABLE alphabet (
+   a int,
+   b int,
+   c int,
+   PRIMARY KEY ((a), b, c)
+)
+WITH COMPACT STORAGE
+AND CLUSTERING ORDER BY (b ASC, c DESC)
+AND default_time_to_live = 300;