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/242d54b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/242d54b4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/242d54b4 Branch: refs/heads/trunk Commit: 242d54b493cc7266f6ad14b4d71d1c2309a0220d Parents: 45084f1 fee7137 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Oct 29 10:25:25 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Oct 29 10:25:25 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/242d54b4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5a3f8ce,274d07a..61ec5c1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,37 @@@ +3.0 + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * 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-7028) + * 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) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Fix race in RecoveryManagerTest (CASSANDRA-8176) * Avoid IllegalArgumentException while sorting sstables in IndexSummaryManager (CASSANDRA-8182) * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579) http://git-wip-us.apache.org/repos/asf/cassandra/blob/242d54b4/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/RecoveryManagerTest.java index ff90998,460c267..78e82f3 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java @@@ -44,40 -37,21 +44,43 @@@ import static org.apache.cassandra.db.K import static org.apache.cassandra.Util.cellname; @RunWith(OrderedJUnit4ClassRunner.class) -public class RecoveryManagerTest extends SchemaLoader +public class RecoveryManagerTest { + private static final String KEYSPACE1 = "RecoveryManagerTest1"; + private static final String CF_STANDARD1 = "Standard1"; + private static final String CF_COUNTER1 = "Counter1"; + + private static final String KEYSPACE2 = "RecoveryManagerTest2"; + private static final String CF_STANDARD3 = "Standard3"; + + @BeforeClass + public static void defineSchema() throws ConfigurationException + { + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, + SimpleStrategy.class, + KSMetaData.optsWithRF(1), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1), + CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER1, BytesType.instance).defaultValidator(CounterColumnType.instance)); + SchemaLoader.createKeyspace(KEYSPACE2, + SimpleStrategy.class, + KSMetaData.optsWithRF(1), + SchemaLoader.standardCFMD(KEYSPACE2, CF_STANDARD3)); + } + @Test - public void testNothingToRecover() throws IOException { + public void testNothingToRecover() throws IOException + { + CommitLog.instance.resetUnsafe(); CommitLog.instance.recover(); } @Test public void testOne() throws IOException { + CommitLog.instance.resetUnsafe(); - Keyspace keyspace1 = Keyspace.open("Keyspace1"); - Keyspace keyspace2 = Keyspace.open("Keyspace2"); + Keyspace keyspace1 = Keyspace.open(KEYSPACE1); + Keyspace keyspace2 = Keyspace.open(KEYSPACE2); Mutation rm; DecoratedKey dk = Util.dk("keymulti"); @@@ -106,7 -80,8 +109,8 @@@ @Test public void testRecoverCounter() throws IOException { + CommitLog.instance.resetUnsafe(); - Keyspace keyspace1 = Keyspace.open("Keyspace1"); + Keyspace keyspace1 = Keyspace.open(KEYSPACE1); Mutation rm; DecoratedKey dk = Util.dk("key");
