Updated Branches: refs/heads/trunk 969a310c5 -> 2979820e5
Merge branch 'cassandra-1.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/2979820e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2979820e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2979820e Branch: refs/heads/trunk Commit: 2979820e5cde11bb6b3f5e6e984af87c9a1572ab Parents: 969a310 cbf0436 Author: Sylvain Lebresne <[email protected]> Authored: Thu May 24 16:47:02 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu May 24 16:47:02 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/cql3/ColumnIdentifier.java | 19 ++- src/java/org/apache/cassandra/cql3/Cql.g | 21 ++- .../cassandra/cql3/statements/SelectStatement.java | 134 +++++++++++---- .../apache/cassandra/cql3/statements/Selector.java | 98 +++++++++++ 5 files changed, 231 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2979820e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2979820e/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2979820e/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
