You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/03/04 00:14:44 UTC
[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d1e46e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d1e46e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d1e46e4
Branch: refs/heads/trunk
Commit: 2d1e46e40a2c9205ab42ebe5bddfd2bc3837f719
Parents: bef1d0c e7d802e
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 3 17:13:06 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 3 17:13:06 2015 -0600
----------------------------------------------------------------------
.../cassandra/db/compaction/LongCompactionsTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d1e46e4/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
----------------------------------------------------------------------
diff --cc test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
index 94bc09f,a21cee5..e87e336
--- a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
@@@ -99,7 -108,8 +108,8 @@@ public class LongCompactionsTest extend
long start = System.nanoTime();
final int gcBefore = (int) (System.currentTimeMillis() / 1000) - Schema.instance.getCFMetaData(KEYSPACE1, "Standard1").getGcGraceSeconds();
+ assert store.getDataTracker().markCompacting(sstables): "Cannot markCompacting all sstables";
- new CompactionTask(store, sstables, gcBefore).execute(null);
+ new CompactionTask(store, sstables, gcBefore, false).execute(null);
System.out.println(String.format("%s: sstables=%d rowsper=%d colsper=%d: %d ms",
this.getClass().getName(),
sstableCount,