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/ae89731f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae89731f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae89731f Branch: refs/heads/trunk Commit: ae89731f07020f3ce921fbf96a5adb424ac4f9c5 Parents: 356dd5b aa57626 Author: Benedict Elliott Smith <[email protected]> Authored: Fri Sep 4 13:47:22 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Fri Sep 4 13:47:22 2015 +0100 ---------------------------------------------------------------------- .../apache/cassandra/cql3/UpdateParameters.java | 4 +- src/java/org/apache/cassandra/db/Columns.java | 2 +- .../org/apache/cassandra/db/LegacyLayout.java | 4 +- .../apache/cassandra/db/RowUpdateBuilder.java | 6 +- .../cassandra/db/SerializationHeader.java | 1 - .../cassandra/db/UnfilteredDeserializer.java | 2 +- .../db/compaction/CompactionIterator.java | 4 +- .../db/partitions/AtomicBTreePartition.java | 8 +- .../db/partitions/PartitionUpdate.java | 10 +- .../apache/cassandra/db/rows/AbstractRow.java | 1 - .../org/apache/cassandra/db/rows/BTreeRow.java | 64 +++--- src/java/org/apache/cassandra/db/rows/Row.java | 15 +- src/java/org/apache/cassandra/db/rows/Rows.java | 214 ++++++++++--------- .../rows/UnfilteredRowIteratorSerializer.java | 2 +- .../db/rows/UnfilteredRowIterators.java | 21 +- .../cassandra/db/rows/UnfilteredSerializer.java | 2 +- .../cassandra/db/view/MaterializedView.java | 6 +- .../cassandra/index/SecondaryIndexManager.java | 12 +- .../transactions/CompactionTransaction.java | 5 +- .../io/sstable/SSTableSimpleIterator.java | 2 +- .../apache/cassandra/service/DataResolver.java | 6 +- .../cassandra/thrift/ThriftResultsMerger.java | 6 +- .../utils/memory/AbstractAllocator.java | 8 +- .../utils/memory/MemtableAllocator.java | 2 +- .../utils/memory/MemtableBufferAllocator.java | 5 +- .../cassandra/utils/memory/NativeAllocator.java | 2 +- test/unit/org/apache/cassandra/db/RowTest.java | 2 +- .../cassandra/triggers/TriggerExecutorTest.java | 2 +- 28 files changed, 210 insertions(+), 208 deletions(-) ----------------------------------------------------------------------
