Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2472701e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2472701e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2472701e Branch: refs/heads/trunk Commit: 2472701e119416aa391fe76eaf56112f0cecbe4f Parents: 6477286 5c85699 Author: Benedict Elliott Smith <[email protected]> Authored: Mon Jun 30 13:02:44 2014 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon Jun 30 13:02:44 2014 +0100 ---------------------------------------------------------------------- conf/cassandra.yaml | 8 ++ .../org/apache/cassandra/config/Config.java | 8 ++ .../cassandra/config/DatabaseDescriptor.java | 10 +++ .../db/commitlog/AbstractCommitLogService.java | 4 +- .../cassandra/db/commitlog/CommitLog.java | 21 +++++ .../db/commitlog/CommitLogSegmentManager.java | 88 +++++++++++--------- .../org/apache/cassandra/io/util/FileUtils.java | 13 --- .../org/apache/cassandra/db/CommitLogTest.java | 31 +++++++ 8 files changed, 130 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2472701e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2472701e/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2472701e/test/unit/org/apache/cassandra/db/CommitLogTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java index 7e30867,7046536..22b6e6b --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@@ -25,8 -26,8 +26,9 @@@ import java.util.concurrent.TimeUnit import java.util.zip.CRC32; import java.util.zip.Checksum; + import com.google.common.util.concurrent.Uninterruptibles; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; @@@ -38,9 -38,8 +40,10 @@@ import org.apache.cassandra.db.commitlo import org.apache.cassandra.db.commitlog.CommitLogDescriptor; import org.apache.cassandra.db.commitlog.CommitLogSegment; import org.apache.cassandra.db.composites.CellName; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.net.MessagingService; + import org.apache.cassandra.service.StorageService; import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
