You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/09/08 12:57:00 UTC
[7/7] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
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/322e21ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/322e21ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/322e21ec
Branch: refs/heads/trunk
Commit: 322e21ec4ec4200d155ea5eb8e7545c446c3c726
Parents: fba356d 351c7ca
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Sep 8 11:53:45 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Sep 8 11:53:45 2015 +0100
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 2 +-
.../org/apache/cassandra/db/Directories.java | 5 +-
.../apache/cassandra/db/lifecycle/Helpers.java | 12 +-
.../db/lifecycle/LifecycleTransaction.java | 64 +-
.../db/lifecycle/LogAwareFileLister.java | 196 +++
.../apache/cassandra/db/lifecycle/LogFile.java | 364 ++++++
.../cassandra/db/lifecycle/LogRecord.java | 208 ++++
.../cassandra/db/lifecycle/LogTransaction.java | 418 +++++++
.../apache/cassandra/db/lifecycle/Tracker.java | 4 +-
.../cassandra/db/lifecycle/TransactionLog.java | 1141 ------------------
.../apache/cassandra/io/sstable/SSTable.java | 1 -
.../io/sstable/format/SSTableReader.java | 5 +-
.../org/apache/cassandra/io/util/FileUtils.java | 10 +-
.../apache/cassandra/service/GCInspector.java | 4 +-
.../cassandra/service/StorageService.java | 4 +-
.../cassandra/tools/StandaloneScrubber.java | 3 +-
.../cassandra/tools/StandaloneSplitter.java | 3 +-
.../cassandra/tools/StandaloneUpgrader.java | 3 +-
.../org/apache/cassandra/utils/CLibrary.java | 2 +-
.../org/apache/cassandra/db/KeyCacheTest.java | 5 +-
.../unit/org/apache/cassandra/db/ScrubTest.java | 3 +-
.../cassandra/db/lifecycle/HelpersTest.java | 4 +-
.../db/lifecycle/LifecycleTransactionTest.java | 2 +-
.../db/lifecycle/LogTransactionTest.java | 823 +++++++++++++
.../db/lifecycle/RealTransactionsTest.java | 7 +-
.../cassandra/db/lifecycle/TrackerTest.java | 7 +-
.../db/lifecycle/TransactionLogTest.java | 812 -------------
.../io/sstable/SSTableRewriterTest.java | 35 +-
.../org/apache/cassandra/schema/DefsTest.java | 4 +-
29 files changed, 2109 insertions(+), 2042 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/322e21ec/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------