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/cassandra-2.0
Commit: 9a42e28d9fdf26ab43633ea1daec968232c06d64
Parents: b0280cb 17186d8
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Sat Aug 24 03:26:51 2013 +0300
Committer: Aleksey Yeschenko <alek...@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;
