Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/308f2c0f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/308f2c0f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/308f2c0f Branch: refs/heads/trunk Commit: 308f2c0fcaf4956ffb4ff0795fc15e03bdf743ee Parents: 0c45727 33bd8c2 Author: Sylvain Lebresne <[email protected]> Authored: Mon May 19 12:26:49 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon May 19 12:26:49 2014 +0200 ---------------------------------------------------------------------- .../apache/cassandra/cql3/ColumnCondition.java | 277 +++++++++++++------ src/java/org/apache/cassandra/cql3/Lists.java | 13 + src/java/org/apache/cassandra/cql3/Maps.java | 20 ++ src/java/org/apache/cassandra/cql3/Sets.java | 15 + .../cql3/statements/CQL3CasConditions.java | 10 +- .../cql3/statements/ModificationStatement.java | 4 +- .../cql3/statements/SelectStatement.java | 16 +- .../cassandra/cql3/statements/Selection.java | 39 +-- 8 files changed, 272 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/308f2c0f/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java ----------------------------------------------------------------------
