From 13d3a47461af24fbd4b2ddee71a7042168ed860f Mon Sep 17 00:00:00 2001
From: Mikhail Stepura <mishail@apache.org>
Date: Wed, 16 Apr 2014 21:10:18 -0700
Subject: [PATCH] cqlsh: Updated CQL3 parser to support functions and BLOB
 literals

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7018
---
 CHANGES.txt                    |  1 +
 bin/cqlsh                      |  2 +-
 pylib/cqlshlib/cql3handling.py | 24 ++++++++++++++++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index bb08a3798785..bf80e1e240d2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@
  * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
  * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
  * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
+ * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
 
 
 1.2.16
diff --git a/bin/cqlsh b/bin/cqlsh
index 4bf1b7678fec..8e1e0e20b1fb 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -133,7 +133,7 @@ if os.path.exists(OLD_HISTORY):
 
 DEFAULT_HOST = 'localhost'
 DEFAULT_PORT = 9160
-DEFAULT_CQLVER = '3'
+DEFAULT_CQLVER = '3.0.5'
 DEFAULT_TRANSPORT_FACTORY = 'cqlshlib.tfactory.regular_transport_factory'
 
 DEFAULT_TIME_FORMAT = '%Y-%m-%d %H:%M:%S%z'
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 50e201502c7a..b04ba1d2d31f 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -206,6 +206,7 @@ def dequote_any(cls, t):
 <stringLiteral> ::= /'([^']|'')*'/ ;
 <quotedName> ::=    /"([^"]|"")*"/ ;
 <float> ::=         /-?[0-9]+\.[0-9]+/ ;
+<blobLiteral> ::=    /0x[0-9a-f]+/ ;
 <wholenumber> ::=   /[0-9]+/ ;
 <uuid> ::=          /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/ ;
 <identifier> ::=    /[a-z][a-z0-9_]*/ ;
@@ -230,10 +231,15 @@ def dequote_any(cls, t):
          | <float>
          | <uuid>
          | <boolean>
+         | <blobLiteral>
+         | <functionName> <functionArguments>
          ;
 
+<functionArguments> ::= "(" ( <term> ( "," <term> )* )? ")"
+                 ;
+
 <tokenDefinition> ::= token="TOKEN" "(" <term> ( "," <term> )* ")"
-                    | <stringLiteral>
+                    | <term>
                     ;
 <value> ::= <term>
           | <collectionLiteral>
@@ -255,6 +261,9 @@ def dequote_any(cls, t):
 <mapLiteral> ::= "{" <term> ":" <term> ( "," <term> ":" <term> )* "}"
                ;
 
+<functionName> ::= <identifier>
+                 ;
+
 <statementBody> ::= <useStatement>
                   | <selectStatement>
                   | <dataChangeStatement>
@@ -739,13 +748,13 @@ def working_on_keyspace(ctxt):
                  ;
 <selectStatement> ::= "SELECT" <selectClause>
                         "FROM" cf=<columnFamilyName>
-                          ("WHERE" <whereClause>)?
-                          ("ORDER" "BY" <orderByClause> ( "," <orderByClause> )* )?
-                          ("LIMIT" limit=<wholenumber>)?
+                          ( "WHERE" <whereClause> )?
+                          ( "ORDER" "BY" <orderByClause> ( "," <orderByClause> )* )?
+                          ( "LIMIT" limit=<wholenumber> )?
                     ;
-<whereClause> ::= <relation> ("AND" <relation>)*
+<whereClause> ::= <relation> ( "AND" <relation> )*
                 ;
-<relation> ::= [rel_lhs]=<cident> ("=" | "<" | ">" | "<=" | ">=") <term>
+<relation> ::= [rel_lhs]=<cident> ( "=" | "<" | ">" | "<=" | ">=" ) <term>
              | token="TOKEN" "(" [rel_tokname]=<cident>
                                  ( "," [rel_tokname]=<cident> )*
                              ")" ("=" | "<" | ">" | "<=" | ">=") <tokenDefinition>
@@ -758,7 +767,10 @@ def working_on_keyspace(ctxt):
 <selector> ::= [colname]=<cident>
              | "WRITETIME" "(" [colname]=<cident> ")"
              | "TTL" "(" [colname]=<cident> ")"
+             | <functionName> <selectionFunctionArguments>
              ;
+<selectionFunctionArguments> ::= "(" ( <selector> ( "," <selector> )* )? ")"
+                          ;
 <orderByClause> ::= [ordercol]=<cident> ( "ASC" | "DESC" )?
                   ;
 '''