Updated Branches: refs/heads/trunk 989dd44c0 -> 7fdd4ccbd
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fdd4ccb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fdd4ccb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fdd4ccb Branch: refs/heads/trunk Commit: 7fdd4ccbdcc0ca22a93eab7e8e8a993093ba1024 Parents: 989dd44 4154434 Author: Sylvain Lebresne <[email protected]> Authored: Thu Dec 6 08:41:44 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Dec 6 08:41:44 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 9 +- .../cassandra/cql3/operations/ColumnOperation.java | 7 ++ .../cassandra/cql3/operations/ListOperation.java | 61 ++++++++++++++- .../cassandra/cql3/operations/MapOperation.java | 29 +++++++ .../cassandra/cql3/operations/Operation.java | 3 + .../cql3/operations/PreparedOperation.java | 6 ++ .../cassandra/cql3/operations/SetOperation.java | 8 ++ .../cassandra/cql3/statements/BatchStatement.java | 2 +- .../cassandra/cql3/statements/DeleteStatement.java | 23 +++++- .../cql3/statements/ModificationStatement.java | 2 +- .../cassandra/cql3/statements/UpdateStatement.java | 14 +-- 12 files changed, 143 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fdd4ccb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fdd4ccb/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fdd4ccb/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ----------------------------------------------------------------------
