Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e0b88878c -> 992a27e03 refs/heads/trunk dc84af47c -> 5b8a6b63d
Add ALLOW FILTERING and CONTAINS to cqlsh post-6910 Patch by Robert Stupp, reviewed by brandonwilliams for CASSANDRA-7588 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/992a27e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/992a27e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/992a27e0 Branch: refs/heads/cassandra-2.1 Commit: 992a27e03fd96c785f0fdf40e78a19de8fc4c759 Parents: e0b8887 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jul 22 14:09:04 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jul 22 14:09:04 2014 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/992a27e0/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py index 3d489d3..a676319 100644 --- a/pylib/cqlshlib/cql3handling.py +++ b/pylib/cqlshlib/cql3handling.py @@ -595,13 +595,14 @@ syntax_rules += r''' ( "WHERE" <whereClause> )? ( "ORDER" "BY" <orderByClause> ( "," <orderByClause> )* )? ( "LIMIT" limit=<wholenumber> )? + ( "ALLOW" "FILTERING" )? ; <whereClause> ::= <relation> ( "AND" <relation> )* ; -<relation> ::= [rel_lhs]=<cident> ( "=" | "<" | ">" | "<=" | ">=" ) <term> +<relation> ::= [rel_lhs]=<cident> ( "=" | "<" | ">" | "<=" | ">=" | "CONTAINS" ) <term> | token="TOKEN" "(" [rel_tokname]=<cident> ( "," [rel_tokname]=<cident> )* - ")" ("=" | "<" | ">" | "<=" | ">=") <tokenDefinition> + ")" ("=" | "<" | ">" | "<=" | ">=" | "CONTAINS") <tokenDefinition> | [rel_lhs]=<cident> "IN" "(" <term> ( "," <term> )* ")" ; <selectClause> ::= "DISTINCT"? <selector> ("AS" <cident>)? ("," <selector> ("AS" <cident>)?)*