Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac1b7c17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac1b7c17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac1b7c17 Branch: refs/heads/trunk Commit: ac1b7c17db74653ffc771454e0fe9210550589a2 Parents: 25f1065 e5a5fb9 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Apr 3 08:33:48 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Apr 3 08:33:48 2017 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/CompactionsCQLTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac1b7c17/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java index afbfee1,1d77b17..ce85dc5 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java @@@ -63,12 -63,12 +63,12 @@@ public class CompactionsCQLTest extend public void testTriggerMinorCompactionDTCS() throws Throwable { createTable("CREATE TABLE %s (id text PRIMARY KEY) WITH compaction = {'class':'DateTieredCompactionStrategy', 'min_threshold':2};"); - assertTrue(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled()); + assertTrue(getCurrentColumnFamilyStore().getCompactionStrategyManager().isEnabled()); - execute("insert into %s (id) values ('1')"); + execute("insert into %s (id) values ('1') using timestamp 1000"); // same timestamp = same window = minor compaction triggered flush(); - execute("insert into %s (id) values ('1')"); + execute("insert into %s (id) values ('1') using timestamp 1000"); flush(); - waitForMinor(KEYSPACE, currentTable(), 5000, true); + waitForMinor(KEYSPACE, currentTable(), SLEEP_TIME, true); } @Test
