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/05/04 20:39:11 UTC
[4/4] cassandra git commit: fixup 9251 unit test
fixup 9251 unit test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dea6b02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dea6b02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dea6b02
Branch: refs/heads/trunk
Commit: 1dea6b0201545c16d4b29af51ce1bb5e77fc02d2
Parents: 2624932
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon May 4 19:38:53 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon May 4 19:38:53 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dea6b02/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 911926a..35e288d 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -1308,7 +1308,7 @@ public class CompactionManager implements CompactionManagerMBean
return executor.submit(runnable);
}
- static int getDefaultGcBefore(ColumnFamilyStore cfs)
+ public static int getDefaultGcBefore(ColumnFamilyStore cfs)
{
// 2ndary indexes have ExpiringColumns too, so we need to purge tombstones deleted before now. We do not need to
// add any GcGrace however since 2ndary indexes are local to a node.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dea6b02/test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java b/test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
index f218c9d..3bcccf0 100644
--- a/test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
+++ b/test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
@@ -140,7 +140,7 @@ public class CrcCheckChanceTest extends CQLTester
}
DatabaseDescriptor.setCompactionThroughputMbPerSec(1);
- List<Future<?>> futures = CompactionManager.instance.submitMaximal(cfs, CompactionManager.GC_ALL);
+ List<Future<?>> futures = CompactionManager.instance.submitMaximal(cfs, CompactionManager.getDefaultGcBefore(cfs), false);
execute("DROP TABLE %s");
try