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/0fd857ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0fd857ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0fd857ba Branch: refs/heads/trunk Commit: 0fd857baf462b4e8c47366f345ba938ce6574657 Parents: a134925 9ed2727 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Aug 20 20:50:20 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Aug 20 20:50:20 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/ColumnFamilyStore.java | 73 +++++++++--- .../org/apache/cassandra/db/Directories.java | 42 +++++-- src/java/org/apache/cassandra/db/Keyspace.java | 5 + src/java/org/apache/cassandra/db/Memtable.java | 32 +++-- .../compaction/AbstractCompactionStrategy.java | 24 +++- .../db/compaction/AbstractCompactionTask.java | 3 +- .../db/compaction/CompactionManager.java | 6 +- .../compaction/CompactionStrategyManager.java | 40 +++++-- .../cassandra/db/compaction/CompactionTask.java | 22 ++-- .../db/compaction/LeveledCompactionTask.java | 6 +- .../db/compaction/SSTableSplitter.java | 3 +- .../cassandra/db/compaction/Scrubber.java | 3 +- .../SizeTieredCompactionStrategy.java | 4 +- .../writers/CompactionAwareWriter.java | 53 ++++++--- .../writers/DefaultCompactionWriter.java | 32 ++--- .../writers/MajorLeveledCompactionWriter.java | 46 ++++---- .../writers/MaxSSTableSizeWriter.java | 45 ++++--- .../SplittingSizeTieredCompactionWriter.java | 52 ++++----- .../db/lifecycle/LifecycleTransaction.java | 9 ++ .../apache/cassandra/db/lifecycle/Tracker.java | 34 +++--- .../org/apache/cassandra/db/lifecycle/View.java | 4 +- .../io/sstable/AbstractSSTableSimpleWriter.java | 11 +- .../io/sstable/SSTableMultiWriter.java | 54 +++++++++ .../cassandra/io/sstable/SSTableTxnWriter.java | 43 +++++-- .../io/sstable/SimpleSSTableMultiWriter.java | 116 +++++++++++++++++++ .../notifications/SSTableAddedNotification.java | 4 +- .../cassandra/streaming/StreamReader.java | 22 ++-- .../cassandra/streaming/StreamReceiveTask.java | 22 ++-- .../compress/CompressedStreamReader.java | 8 +- .../streaming/messages/IncomingFileMessage.java | 7 +- .../cassandra/tools/SSTableExpiredBlockers.java | 3 +- .../cassandra/tools/SSTableLevelResetter.java | 2 +- .../cassandra/tools/SSTableOfflineRelevel.java | 5 +- .../cassandra/tools/StandaloneScrubber.java | 2 +- .../cassandra/tools/StandaloneUpgrader.java | 2 +- .../cassandra/tools/StandaloneVerifier.java | 7 +- .../db/compaction/LongCompactionsTest.java | 6 +- test/unit/org/apache/cassandra/MockSchema.java | 2 +- .../cassandra/db/ColumnFamilyStoreTest.java | 4 +- .../unit/org/apache/cassandra/db/ScrubTest.java | 12 +- .../db/compaction/AntiCompactionTest.java | 10 +- .../compaction/CompactionAwareWriterTest.java | 8 +- .../LeveledCompactionStrategyTest.java | 2 +- .../db/lifecycle/RealTransactionsTest.java | 8 +- .../cassandra/db/lifecycle/TrackerTest.java | 19 +-- .../apache/cassandra/db/lifecycle/ViewTest.java | 2 +- .../io/sstable/BigTableWriterTest.java | 4 +- .../io/sstable/CQLSSTableWriterClientTest.java | 2 + .../io/sstable/SSTableRewriterTest.java | 10 +- .../cassandra/io/sstable/SSTableUtils.java | 25 ++-- .../org/apache/cassandra/schema/DefsTest.java | 6 +- 51 files changed, 651 insertions(+), 315 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fd857ba/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
