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/4ffb5cc6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ffb5cc6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ffb5cc6 Branch: refs/heads/trunk Commit: 4ffb5cc60707c34171ca57e692297b6f47fd1ee7 Parents: 881776f fe388d4 Author: Benedict Elliott Smith <[email protected]> Authored: Tue Aug 11 17:46:12 2015 +0200 Committer: Benedict Elliott Smith <[email protected]> Committed: Tue Aug 11 17:46:12 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 2 +- src/java/org/apache/cassandra/db/Columns.java | 230 +++++++++++++++- .../org/apache/cassandra/db/ReadCommand.java | 4 +- .../cassandra/db/ReadCommandVerbHandler.java | 2 +- .../org/apache/cassandra/db/ReadResponse.java | 87 ++++-- .../cassandra/db/SerializationHeader.java | 50 +++- .../partitions/ArrayBackedCachedPartition.java | 6 +- .../db/partitions/PartitionUpdate.java | 6 +- .../UnfilteredPartitionIterators.java | 8 +- .../rows/UnfilteredRowIteratorSerializer.java | 25 +- .../apache/cassandra/service/StorageProxy.java | 2 +- .../org/apache/cassandra/db/ColumnsTest.java | 275 +++++++++++++++---- .../cassandra/service/DataResolverTest.java | 2 +- 13 files changed, 582 insertions(+), 117 deletions(-) ----------------------------------------------------------------------
