cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 26 Apr 2017 07:44:53 GMT
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/8dbf808c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8dbf808c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8dbf808c

Branch: refs/heads/cassandra-3.0
Commit: 8dbf808c3d40668cafcec982b38306412ae01b32
Parents: 032a8cc bd540bc
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Apr 26 09:38:34 2017 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Apr 26 09:38:34 2017 +0200

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8dbf808c/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
index cd1f295,362afe7..0d5bc81
--- a/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
@@@ -80,9 -80,9 +80,9 @@@ public class NeverPurgeTest extends CQL
          execute("DELETE FROM %s WHERE a=3");
          cfs.forceBlockingFlush();
          cfs.enableAutoCompaction();
-         while (cfs.getLiveSSTables().size() > 1)
 -        while (cfs.getSSTables().size() > 1 || !cfs.getTracker().getCompacting().isEmpty())
++        while (cfs.getLiveSSTables().size() > 1 || !cfs.getTracker().getCompacting().isEmpty())
              Thread.sleep(100);
 -        verifyContainsTombstones(cfs.getSSTables(), 3);
 +        verifyContainsTombstones(cfs.getLiveSSTables(), 3);
      }
  
      private void testHelper(String deletionStatement) throws Throwable


Mime
View raw message