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 2014/02/11 18:19:54 UTC

git commit: fix AntiCompacitonTest

Updated Branches:
  refs/heads/trunk e58737fe0 -> 7a6e5f043


fix AntiCompacitonTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a6e5f04
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a6e5f04
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a6e5f04

Branch: refs/heads/trunk
Commit: 7a6e5f043670353848fa1373656445c5ca8e4671
Parents: e58737f
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Feb 11 11:16:54 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Feb 11 11:16:54 2014 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
 .../org/apache/cassandra/db/compaction/AntiCompactionTest.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a6e5f04/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 b964c5b..effaf1c 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -302,7 +302,7 @@ public class CompactionManager implements CompactionManagerMBean
      *
      * @param cfs
      * @param ranges Ranges that the repair was carried out on
-     * @param validatedForRepair SSTables containing the repaired ranges
+     * @param validatedForRepair SSTables containing the repaired ranges. Should be referenced before passing them.
      * @throws InterruptedException, ExecutionException, IOException
      */
     public void performAnticompaction(ColumnFamilyStore cfs,

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a6e5f04/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index 164dd62..fb87f80 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -70,6 +70,7 @@ public class AntiCompactionTest extends SchemaLoader
         Range<Token> range = new Range<Token>(new BytesToken("0".getBytes()), new BytesToken("4".getBytes()));
         List<Range<Token>> ranges = Arrays.asList(range);
 
+        SSTableReader.acquireReferences(sstables);
         long repairedAt = 1000;
         CompactionManager.instance.performAnticompaction(store, ranges, sstables, repairedAt);