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/bfd2e082 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfd2e082 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfd2e082 Branch: refs/heads/trunk Commit: bfd2e0820898be75adb3e08a6011bb85d40cd72a Parents: 095de83 e51f83b Author: Benedict Elliott Smith <[email protected]> Authored: Wed Aug 12 23:53:21 2015 +0200 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Aug 12 23:53:21 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/cql3/UpdateParameters.java | 4 +- src/java/org/apache/cassandra/db/Columns.java | 4 +- .../cassandra/db/HintedHandOffManager.java | 4 +- .../org/apache/cassandra/db/LegacyLayout.java | 7 +- .../org/apache/cassandra/db/ReadResponse.java | 12 +- .../apache/cassandra/db/RowUpdateBuilder.java | 7 +- .../db/SinglePartitionNamesCommand.java | 8 +- .../db/SinglePartitionReadCommand.java | 2 +- .../cassandra/db/UnfilteredDeserializer.java | 2 +- .../columniterator/SSTableReversedIterator.java | 44 +- .../cassandra/db/compaction/Scrubber.java | 2 +- .../apache/cassandra/db/filter/RowFilter.java | 2 +- .../AbstractSimplePerColumnSecondaryIndex.java | 4 +- .../db/index/composites/CompositesIndex.java | 2 +- .../cassandra/db/index/keys/KeysSearcher.java | 2 +- .../db/partitions/AbstractBTreePartition.java | 403 +++++++++++++ .../AbstractThreadUnsafePartition.java | 399 ------------ .../partitions/ArrayBackedCachedPartition.java | 294 --------- .../db/partitions/ArrayBackedPartition.java | 114 ---- .../db/partitions/AtomicBTreePartition.java | 240 +------- .../db/partitions/CachedBTreePartition.java | 249 ++++++++ .../db/partitions/CachedPartition.java | 10 +- .../db/partitions/FilteredPartition.java | 89 +-- .../db/partitions/ImmutableBTreePartition.java | 93 +++ .../db/partitions/PartitionUpdate.java | 311 +++------- .../cassandra/db/rows/BTreeBackedRow.java | 602 ------------------- .../org/apache/cassandra/db/rows/BTreeRow.java | 602 +++++++++++++++++++ .../apache/cassandra/db/rows/EncodingStats.java | 11 + src/java/org/apache/cassandra/db/rows/Row.java | 2 +- .../apache/cassandra/db/rows/RowIterators.java | 22 +- src/java/org/apache/cassandra/db/rows/Rows.java | 4 +- .../rows/UnfilteredRowIteratorSerializer.java | 2 +- .../db/rows/UnfilteredRowIterators.java | 16 +- .../cassandra/db/rows/UnfilteredSerializer.java | 2 +- .../cassandra/db/view/MaterializedView.java | 18 +- .../apache/cassandra/db/view/TemporalRow.java | 4 +- .../io/sstable/SSTableSimpleIterator.java | 2 +- .../apache/cassandra/service/CacheService.java | 6 +- .../apache/cassandra/service/DataResolver.java | 2 +- .../cassandra/thrift/CassandraServer.java | 8 +- .../cassandra/thrift/ThriftResultsMerger.java | 4 +- .../cassandra/triggers/TriggerExecutor.java | 4 +- .../org/apache/cassandra/utils/btree/BTree.java | 89 ++- .../cassandra/utils/btree/UpdateFunction.java | 27 +- .../utils/memory/AbstractAllocator.java | 10 +- .../utils/memory/MemtableBufferAllocator.java | 3 +- .../apache/cassandra/utils/LongBTreeTest.java | 151 +++-- test/unit/org/apache/cassandra/Util.java | 10 +- .../cassandra/cache/CacheProviderTest.java | 18 +- .../org/apache/cassandra/cql3/CQLTester.java | 2 +- .../cassandra/db/BatchlogManagerTest.java | 21 +- .../cassandra/db/DeletePartitionTest.java | 2 +- .../org/apache/cassandra/db/PartitionTest.java | 10 +- .../apache/cassandra/db/RangeTombstoneTest.java | 4 +- .../apache/cassandra/db/RowIndexEntryTest.java | 2 +- test/unit/org/apache/cassandra/db/RowTest.java | 4 +- .../db/compaction/CompactionsPurgeTest.java | 10 +- .../cassandra/db/marshal/CompositeTypeTest.java | 4 +- .../db/marshal/DynamicCompositeTypeTest.java | 6 +- .../rows/RowAndDeletionMergeIteratorTest.java | 2 +- .../rows/UnfilteredRowIteratorsMergeTest.java | 2 +- .../io/sstable/SSTableRewriterTest.java | 4 +- .../streaming/StreamingTransferTest.java | 4 +- .../cassandra/triggers/TriggerExecutorTest.java | 2 +- .../org/apache/cassandra/utils/BTreeTest.java | 118 +++- 65 files changed, 1943 insertions(+), 2181 deletions(-) ----------------------------------------------------------------------
