merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d282ca5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d282ca5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d282ca5 Branch: refs/heads/trunk Commit: 4d282ca5d92ba9ae04e00491cd433bde1af67dbc Parents: b1c45b7 a5bc52e Author: Jonathan Ellis <[email protected]> Authored: Tue Jul 29 11:58:29 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Jul 29 11:58:29 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../cassandra/db/commitlog/CommitLog.java | 17 +-- .../db/commitlog/CommitLogDescriptor.java | 8 +- .../db/commitlog/CommitLogReplayer.java | 76 +++-------- .../commitlog/MalformedCommitLogException.java | 16 --- .../cassandra/service/CassandraDaemon.java | 2 - .../org/apache/cassandra/db/CommitLogTest.java | 127 ++++--------------- 7 files changed, 48 insertions(+), 199 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d282ca5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 47c5ce1,1a2dc57..119e005 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,6 +1,23 @@@ +3.0 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7208) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add duration mode to cassandra-stress (CASSANDRA-7468) * Add listen_interface and rpc_interface options (CASSANDRA-7417) - * Fail to start if commit log replay detects a problem (CASSANDRA-7125) * Improve schema merge performance (CASSANDRA-7444) * Adjust MT depth based on # of partition validating (CASSANDRA-5263) * Optimise NativeCell comparisons (CASSANDRA-6755) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d282ca5/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d282ca5/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java index 3f1b7b5,91c81e1..e50a585 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java @@@ -28,10 -28,9 +28,8 @@@ import java.nio.ByteBuffer import java.util.regex.Matcher; import java.util.regex.Pattern; - import com.google.common.annotations.VisibleForTesting; - import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.PureJavaCrc32; public class CommitLogDescriptor http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d282ca5/test/unit/org/apache/cassandra/db/CommitLogTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java index 762d2d0,7046536..f8cb8c8 --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@@ -35,18 -34,12 +35,15 @@@ import org.apache.cassandra.SchemaLoade import org.apache.cassandra.Util; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.commitlog.CommitLogDescriptor; - import org.apache.cassandra.db.commitlog.CommitLogReplayer; import org.apache.cassandra.db.commitlog.CommitLogSegment; - import org.apache.cassandra.db.commitlog.MalformedCommitLogException; 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 org.apache.cassandra.utils.PureJavaCrc32; import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
