Merge branch 'cassandra-2.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/40424ee5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40424ee5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40424ee5 Branch: refs/heads/trunk Commit: 40424ee598d2c64e7530a5bf0febd0bd4e8d825c Parents: 67baaef 1f8516d Author: Sam Tunnicliffe <[email protected]> Authored: Thu Jun 18 17:44:34 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Jun 18 17:44:34 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/ColumnIdentifier.java | 6 +- .../cassandra/cql3/ColumnSpecification.java | 6 + .../restrictions/StatementRestrictions.java | 22 +- .../selection/AbstractFunctionSelector.java | 13 + .../cassandra/cql3/selection/FieldSelector.java | 8 +- .../cassandra/cql3/selection/Selectable.java | 10 +- .../cassandra/cql3/selection/Selection.java | 58 +-- .../cql3/selection/SelectionColumnMapping.java | 118 +++++++ .../cql3/selection/SelectionColumns.java | 18 + .../cassandra/cql3/selection/Selector.java | 13 + .../cql3/selection/SelectorFactories.java | 2 +- .../cql3/selection/SimpleSelector.java | 17 +- .../cql3/selection/WritetimeOrTTLSelector.java | 14 +- .../cql3/statements/SelectStatement.java | 28 +- .../selection/SelectionColumnMappingTest.java | 353 +++++++++++++++++++ 16 files changed, 633 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40424ee5/CHANGES.txt ----------------------------------------------------------------------
