Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9967303f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9967303f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9967303f Branch: refs/heads/trunk Commit: 9967303f6e22db40400163d0625f15af74de9a05 Parents: bb82624 b99c863 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Sep 18 13:24:15 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Sep 18 13:24:15 2015 +0200 ---------------------------------------------------------------------- doc/native_protocol_v3.spec | 3 + doc/native_protocol_v4.spec | 5 + .../org/apache/cassandra/cql3/QueryOptions.java | 6 +- .../apache/cassandra/cql3/QueryProcessor.java | 3 +- .../org/apache/cassandra/cql3/ResultSet.java | 6 +- .../cql3/statements/SelectStatement.java | 4 +- .../org/apache/cassandra/db/Clustering.java | 29 +++ .../org/apache/cassandra/db/LegacyLayout.java | 2 +- .../cassandra/db/PartitionRangeReadCommand.java | 6 +- src/java/org/apache/cassandra/db/ReadQuery.java | 5 +- .../db/SinglePartitionNamesCommand.java | 1 + .../db/SinglePartitionReadCommand.java | 14 +- .../org/apache/cassandra/db/rows/BTreeRow.java | 48 +++- .../cassandra/db/rows/ComplexColumnData.java | 5 + src/java/org/apache/cassandra/db/rows/Row.java | 3 +- src/java/org/apache/cassandra/db/view/View.java | 5 +- .../apache/cassandra/db/view/ViewBuilder.java | 3 +- .../service/pager/AbstractQueryPager.java | 4 +- .../service/pager/MultiPartitionPager.java | 8 +- .../cassandra/service/pager/PagingState.java | 220 ++++++++++++++++--- .../cassandra/service/pager/QueryPagers.java | 3 +- .../service/pager/RangeNamesQueryPager.java | 4 +- .../service/pager/RangeSliceQueryPager.java | 16 +- .../service/pager/SinglePartitionPager.java | 16 +- .../org/apache/cassandra/transport/CBUtil.java | 7 + .../cassandra/service/QueryPagerTest.java | 97 +++++++- .../service/pager/PagingStateTest.java | 99 +++++++++ 27 files changed, 526 insertions(+), 96 deletions(-) ----------------------------------------------------------------------
