Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcb4da73 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcb4da73 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcb4da73 Branch: refs/heads/cassandra-2.0 Commit: bcb4da739cc6a0fdb83f49772dc0de1659bc8ced Parents: eb96db6 a0fa697 Author: Dave Brosius <[email protected]> Authored: Fri Sep 20 10:49:10 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Sep 20 10:49:10 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Cql.g | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcb4da73/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/Cql.g index 6fb0db4,7101c71..17afb00 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@@ -869,10 -789,9 +869,11 @@@ relation[List<Relation> clauses for (ColumnIdentifier id : l) $clauses.add(new Relation(id, type, t, true)); } + | name=cident K_IN { Term.Raw marker = null; } (QMARK { marker = newINBindVariables(null); } | ':' mid=cident { marker = newINBindVariables(mid); }) + { $clauses.add(new Relation(name, Relation.Type.IN, marker)); } | name=cident K_IN { Relation rel = Relation.createInRelation($name.id); } '(' ( f1=term { rel.addInValue(f1); } (',' fN=term { rel.addInValue(fN); } )* )? ')' { $clauses.add(rel); } + | '(' relation[$clauses] ')' ; comparatorType returns [CQL3Type t]
