You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/09/20 16:52:51 UTC
[1/2] git commit: allow parenthesis around where conditions in cql
patch by dbrosius reviewed by slebresne for cassandra-6037
Updated Branches:
refs/heads/cassandra-2.0 eb96db6c1 -> bcb4da739
allow parenthesis around where conditions in cql
patch by dbrosius reviewed by slebresne for cassandra-6037
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0fa6971
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0fa6971
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0fa6971
Branch: refs/heads/cassandra-2.0
Commit: a0fa69715f7913804fbd55c1280e0d35edd3bf0f
Parents: df046d6
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 20 10:47:36 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 20 10:47:36 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/a0fa6971/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g
index 2445bf2..7101c71 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -791,6 +791,7 @@ relation[List<Relation> clauses]
}
| 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]
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by db...@apache.org.
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 <db...@apache.org>
Authored: Fri Sep 20 10:49:10 2013 -0400
Committer: Dave Brosius <db...@apache.org>
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]