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/13ec86ce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13ec86ce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13ec86ce Branch: refs/heads/trunk Commit: 13ec86ce9e4fe6616bff85aa4730686212a347c1 Parents: 5e9835b 5726625 Author: Benedict Elliott Smith <[email protected]> Authored: Mon Aug 17 10:20:15 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon Aug 17 10:20:15 2015 +0100 ---------------------------------------------------------------------- NEWS.txt | 18 + bin/sstablelister | 55 - bin/sstablelister.bat | 41 - bin/sstableutil | 55 + bin/sstableutil.bat | 41 + .../apache/cassandra/db/ColumnFamilyStore.java | 12 +- .../org/apache/cassandra/db/Directories.java | 145 ++- .../db/compaction/CompactionManagerMBean.java | 3 +- .../cassandra/db/compaction/Upgrader.java | 9 - .../writers/MajorLeveledCompactionWriter.java | 9 +- .../apache/cassandra/db/lifecycle/Helpers.java | 12 +- .../db/lifecycle/LifecycleTransaction.java | 69 +- .../apache/cassandra/db/lifecycle/Tracker.java | 4 +- .../cassandra/db/lifecycle/TransactionLog.java | 1137 ++++++++++++++++++ .../cassandra/db/lifecycle/TransactionLogs.java | 786 ------------ .../cassandra/io/sstable/SSTableLoader.java | 162 ++- .../io/sstable/format/SSTableReader.java | 22 +- .../cassandra/io/sstable/format/Version.java | 2 + .../io/sstable/format/big/BigFormat.java | 12 + .../io/sstable/metadata/CompactionMetadata.java | 43 +- .../metadata/LegacyMetadataSerializer.java | 13 +- .../io/sstable/metadata/MetadataCollector.java | 28 +- .../org/apache/cassandra/io/util/FileUtils.java | 5 - .../apache/cassandra/service/GCInspector.java | 4 +- .../apache/cassandra/service/StartupChecks.java | 3 +- .../cassandra/service/StorageService.java | 4 +- .../cassandra/tools/SSTableExpiredBlockers.java | 3 +- .../cassandra/tools/SSTableLevelResetter.java | 3 +- .../cassandra/tools/SSTableMetadataViewer.java | 2 - .../cassandra/tools/SSTableOfflineRelevel.java | 2 +- .../cassandra/tools/StandaloneLister.java | 214 ---- .../cassandra/tools/StandaloneSSTableUtil.java | 241 ++++ .../cassandra/tools/StandaloneScrubber.java | 6 +- .../cassandra/tools/StandaloneSplitter.java | 4 +- .../cassandra/tools/StandaloneUpgrader.java | 6 +- .../cassandra/tools/StandaloneVerifier.java | 2 +- .../apache/cassandra/tools/nodetool/Stop.java | 2 +- .../cassandra/db/ColumnFamilyStoreTest.java | 2 +- .../apache/cassandra/db/DirectoriesTest.java | 7 +- .../org/apache/cassandra/db/KeyCacheTest.java | 6 +- .../unit/org/apache/cassandra/db/ScrubTest.java | 4 +- .../cassandra/db/lifecycle/HelpersTest.java | 9 +- .../db/lifecycle/LifecycleTransactionTest.java | 2 +- .../db/lifecycle/RealTransactionsTest.java | 15 +- .../cassandra/db/lifecycle/TrackerTest.java | 90 +- .../db/lifecycle/TransactionLogTest.java | 791 ++++++++++++ .../db/lifecycle/TransactionLogsTest.java | 581 --------- .../io/sstable/CQLSSTableWriterClientTest.java | 7 - .../io/sstable/CQLSSTableWriterTest.java | 1 - .../io/sstable/SSTableRewriterTest.java | 36 +- .../metadata/MetadataSerializerTest.java | 7 - .../org/apache/cassandra/schema/DefsTest.java | 11 +- 52 files changed, 2625 insertions(+), 2123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13ec86ce/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
