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/e5ab470d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5ab470d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5ab470d Branch: refs/heads/trunk Commit: e5ab470d527c86cfa8347739eeb76c9ef1b5aa9b Parents: 864865d bf52190 Author: Tyler Hobbs <[email protected]> Authored: Thu May 22 14:20:49 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Thu May 22 14:20:49 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/AbstractMarker.java | 10 +- .../org/apache/cassandra/cql3/Constants.java | 6 + src/java/org/apache/cassandra/cql3/Cql.g | 109 +- src/java/org/apache/cassandra/cql3/Lists.java | 13 +- .../cassandra/cql3/MultiColumnRelation.java | 144 +++ .../org/apache/cassandra/cql3/Relation.java | 104 +- .../cassandra/cql3/SingleColumnRelation.java | 95 ++ src/java/org/apache/cassandra/cql3/Term.java | 10 + src/java/org/apache/cassandra/cql3/Tuples.java | 349 ++++++ .../cql3/statements/ModificationStatement.java | 20 +- .../cql3/statements/MultiColumnRestriction.java | 137 +++ .../cassandra/cql3/statements/Restriction.java | 395 +------ .../cql3/statements/SelectStatement.java | 805 ++++++++----- .../statements/SingleColumnRestriction.java | 413 +++++++ .../cassandra/db/composites/CBuilder.java | 2 + .../cassandra/db/composites/Composites.java | 2 + .../cassandra/db/composites/CompoundCType.java | 13 + .../cassandra/db/composites/SimpleCType.java | 10 + .../apache/cassandra/db/marshal/TupleType.java | 279 +++++ .../cassandra/cql3/MultiColumnRelationTest.java | 1114 ++++++++++++++++++ 21 files changed, 3263 insertions(+), 768 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5ab470d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5ab470d/src/java/org/apache/cassandra/cql3/Cql.g ----------------------------------------------------------------------
