Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b93eb40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b93eb40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b93eb40 Branch: refs/heads/trunk Commit: 1b93eb403b5358a1f2a6cbebdc52bb9069e91a76 Parents: 9aefe13 f497c13 Author: blerer <benjamin.le...@datastax.com> Authored: Fri Oct 16 14:48:00 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Fri Oct 16 14:48:12 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/ResultSet.java | 5 ++ .../apache/cassandra/cql3/UntypedResultSet.java | 6 +-- .../cassandra/cql3/selection/Selection.java | 57 +++++++++++++------- .../cassandra/cql3/selection/Selector.java | 12 +++++ .../cql3/selection/SelectorFactories.java | 20 +++++++ .../cql3/selection/SimpleSelector.java | 6 +++ .../cql3/statements/SelectStatement.java | 2 +- .../operations/SelectOrderByTest.java | 52 ++++++++++++++++++ 8 files changed, 138 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b93eb40/src/java/org/apache/cassandra/cql3/ResultSet.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b93eb40/src/java/org/apache/cassandra/cql3/UntypedResultSet.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b93eb40/src/java/org/apache/cassandra/cql3/selection/Selection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b93eb40/src/java/org/apache/cassandra/cql3/selection/Selector.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b93eb40/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b93eb40/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java ----------------------------------------------------------------------
