You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/08/24 02:27:47 UTC
[1/4] git commit: Correct minor CQL3 grammar rules (USING)
Updated Branches:
refs/heads/trunk 0d94d2a0a -> d7977f2c4
Correct minor CQL3 grammar rules (USING)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17186d82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17186d82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17186d82
Branch: refs/heads/trunk
Commit: 17186d82549e82daf032c132c9520aa795680a4f
Parents: ddb501d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 24 03:21:52 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 24 03:21:52 2013 +0300
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 16 ++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17186d82/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 82e14d4..c5b449f 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -955,7 +955,7 @@ def update_indexbracket_completer(ctxt, cass):
syntax_rules += r'''
<deleteStatement> ::= "DELETE" ( <deleteSelector> ( "," <deleteSelector> )* )?
"FROM" cf=<columnFamilyName>
- ( "USING" [delopt]=<deleteOption> ( "AND" [delopt]=<deleteOption> )* )?
+ ( "USING" [delopt]=<deleteOption> )?
"WHERE" <whereClause>
;
<deleteSelector> ::= delcol=<cident> ( memberbracket="[" memberselector=<term> "]" )?
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17186d82/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 218c541..f59be51 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -290,19 +290,11 @@ insertStatement returns [UpdateStatement expr]
;
usingClause[Attributes attrs]
- : K_USING usingClauseObjective[attrs] ( K_AND? usingClauseObjective[attrs] )*
- ;
-
-usingClauseDelete[Attributes attrs]
- : K_USING usingClauseDeleteObjective[attrs] ( K_AND? usingClauseDeleteObjective[attrs] )*
- ;
-
-usingClauseDeleteObjective[Attributes attrs]
- : K_TIMESTAMP ts=INTEGER { attrs.timestamp = Long.valueOf($ts.text); }
+ : K_USING usingClauseObjective[attrs] ( K_AND usingClauseObjective[attrs] )*
;
usingClauseObjective[Attributes attrs]
- : usingClauseDeleteObjective[attrs]
+ : K_TIMESTAMP ts=INTEGER { attrs.timestamp = Long.valueOf($ts.text); }
| K_TTL t=INTEGER { attrs.timeToLive = Integer.valueOf($t.text); }
;
@@ -357,6 +349,10 @@ deleteOp returns [Operation.RawDeletion op]
| c=cident '[' t=term ']' { $op = new Operation.ElementDeletion(c, t); }
;
+usingClauseDelete[Attributes attrs]
+ : K_USING K_TIMESTAMP ts=INTEGER { attrs.timestamp = Long.valueOf($ts.text); }
+ ;
+
/**
* BEGIN BATCH
* UPDATE <CF> SET name1 = value1 WHERE KEY = keyname1;
[3/4] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0.0' 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/f31c668f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f31c668f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f31c668f
Branch: refs/heads/trunk
Commit: f31c668f264945c3db0ac79827b62090a8af6b7c
Parents: 78d78cf 9a42e28
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 24 03:27:16 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 24 03:27:16 2013 +0300
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 16 ++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f31c668f/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f31c668f/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
src/java/org/apache/cassandra/cql3/Cql.g
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a42e28d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a42e28d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a42e28d
Branch: refs/heads/trunk
Commit: 9a42e28d9fdf26ab43633ea1daec968232c06d64
Parents: b0280cb 17186d8
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 24 03:26:51 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 24 03:26:51 2013 +0300
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 16 ++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a42e28d/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a42e28d/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Cql.g
index 0035c41,f59be51..b4816ce
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@@ -305,21 -289,13 +305,13 @@@ insertStatement returns [UpdateStatemen
}
;
-usingClause[Attributes attrs]
+usingClause[Attributes.Raw attrs]
- : K_USING usingClauseObjective[attrs] ( K_AND? usingClauseObjective[attrs] )*
- ;
-
- usingClauseDelete[Attributes.Raw attrs]
- : K_USING usingClauseDeleteObjective[attrs] ( K_AND? usingClauseDeleteObjective[attrs] )*
- ;
-
- usingClauseDeleteObjective[Attributes.Raw attrs]
- : K_TIMESTAMP ts=intValue { attrs.timestamp = ts; }
+ : K_USING usingClauseObjective[attrs] ( K_AND usingClauseObjective[attrs] )*
;
-usingClauseObjective[Attributes attrs]
- : K_TIMESTAMP ts=INTEGER { attrs.timestamp = Long.valueOf($ts.text); }
- | K_TTL t=INTEGER { attrs.timeToLive = Integer.valueOf($t.text); }
+usingClauseObjective[Attributes.Raw attrs]
- : usingClauseDeleteObjective[attrs]
++ : K_TIMESTAMP ts=intValue { attrs.timestamp = ts; }
+ | K_TTL t=intValue { attrs.timeToLive = t; }
;
/**
@@@ -388,6 -349,10 +380,10 @@@ deleteOp returns [Operation.RawDeletio
| c=cident '[' t=term ']' { $op = new Operation.ElementDeletion(c, t); }
;
-usingClauseDelete[Attributes attrs]
- : K_USING K_TIMESTAMP ts=INTEGER { attrs.timestamp = Long.valueOf($ts.text); }
++usingClauseDelete[Attributes.Raw attrs]
++ : K_USING K_TIMESTAMP ts=intValue { attrs.timestamp = ts; }
+ ;
+
/**
* BEGIN BATCH
* UPDATE <CF> SET name1 = value1 WHERE KEY = keyname1;
[4/4] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7977f2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7977f2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7977f2c
Branch: refs/heads/trunk
Commit: d7977f2c4593d593b0ce309dae5501b1ceb51ff7
Parents: 0d94d2a f31c668
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 24 03:27:35 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 24 03:27:35 2013 +0300
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 16 ++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------