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/288f2cf4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/288f2cf4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/288f2cf4 Branch: refs/heads/trunk Commit: 288f2cf4fb8ed90c45511dc0e35b1bdbfbd5a41d Parents: ed9343e 8c64cef Author: Tyler Hobbs <[email protected]> Authored: Fri Aug 7 17:44:28 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Aug 7 17:44:28 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/ModificationStatement.java | 2 +- .../org/apache/cassandra/db/Clustering.java | 8 +- src/java/org/apache/cassandra/db/DataRange.java | 28 +- .../org/apache/cassandra/db/LegacyLayout.java | 922 +++++++++++++++-- .../apache/cassandra/db/PartitionColumns.java | 6 + .../cassandra/db/PartitionRangeReadCommand.java | 11 + .../cassandra/db/RangeSliceVerbHandler.java | 29 + .../org/apache/cassandra/db/ReadCommand.java | 995 ++++++++++++++++++- .../cassandra/db/ReadCommandVerbHandler.java | 9 +- .../org/apache/cassandra/db/ReadResponse.java | 250 ++++- .../db/SinglePartitionReadCommand.java | 11 +- src/java/org/apache/cassandra/db/Slice.java | 48 +- .../filter/AbstractClusteringIndexFilter.java | 20 - .../db/filter/ClusteringIndexFilter.java | 20 + .../db/filter/ClusteringIndexNamesFilter.java | 4 +- .../db/filter/ClusteringIndexSliceFilter.java | 4 +- .../cassandra/db/filter/ColumnFilter.java | 3 + .../apache/cassandra/db/filter/DataLimits.java | 12 +- .../db/marshal/AbstractCompositeType.java | 32 - .../cassandra/db/marshal/CompositeType.java | 26 + .../AbstractThreadUnsafePartition.java | 2 +- .../db/partitions/PartitionUpdate.java | 93 +- .../UnfilteredPartitionIterators.java | 13 +- .../cassandra/db/rows/BTreeBackedRow.java | 62 ++ src/java/org/apache/cassandra/db/rows/Row.java | 12 + .../apache/cassandra/net/MessagingService.java | 4 +- .../cassandra/service/AbstractReadExecutor.java | 5 +- .../apache/cassandra/service/DataResolver.java | 8 +- .../cassandra/service/DigestResolver.java | 6 +- .../apache/cassandra/service/ReadCallback.java | 4 +- .../apache/cassandra/service/StorageProxy.java | 4 +- .../cassandra/service/StorageService.java | 4 +- .../service/pager/RangeSliceQueryPager.java | 4 +- .../service/pager/SinglePartitionPager.java | 8 +- .../cassandra/thrift/CassandraServer.java | 4 +- 36 files changed, 2353 insertions(+), 321 deletions(-) ----------------------------------------------------------------------
