cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Date Wed, 21 Aug 2013 15:48:45 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26d05352
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26d05352
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26d05352

Branch: refs/heads/cassandra-2.0
Commit: 26d05352e28ca2549a3c041d849f53e60703c80d
Parents: 8f367fd dd65e88
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Aug 21 18:42:56 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Aug 21 18:42:56 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |  4 +--
 src/java/org/apache/cassandra/cql3/Cql.g        | 37 +++++++++-----------
 .../apache/cassandra/cql3/QueryProcessor.java   |  9 ++---
 3 files changed, 23 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26d05352/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26d05352/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Cql.g
index b55600b,218c541..0035c41
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@@ -421,10 -390,10 +421,10 @@@ batchStatement returns [BatchStatement.
      : K_BEGIN
        ( K_UNLOGGED { type = BatchStatement.Type.UNLOGGED; } | K_COUNTER { type = BatchStatement.Type.COUNTER;
} )?
        K_BATCH ( usingClause[attrs] )?
-           s1=batchStatementObjective ';'? { statements.add(s1); } ( sN=batchStatementObjective
';'? { statements.add(sN); } )*
+           ( s=batchStatementObjective ';'? { statements.add(s); } )+
        K_APPLY K_BATCH
        {
 -          return new BatchStatement(type, statements, attrs);
 +          return new BatchStatement.Parsed(type, attrs, statements);
        }
      ;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26d05352/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------


Mime
View raw message