You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/09/29 05:48:22 UTC
svn commit: r819827 - in /incubator/cassandra/trunk:
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/io/SSTableTracker.java
test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
Author: jbellis
Date: Tue Sep 29 03:48:21 2009
New Revision: 819827
URL: http://svn.apache.org/viewvc?rev=819827&view=rev
Log:
fix tests
patch by jbellis for CASSANDRA-459
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableTracker.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=819827&r1=819826&r2=819827&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Tue Sep 29 03:48:21 2009
@@ -1325,5 +1325,6 @@
void clearUnsafe()
{
memtable_.clearUnsafe();
+ ssTables_.clearUnsafe();
}
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableTracker.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableTracker.java?rev=819827&r1=819826&r2=819827&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableTracker.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableTracker.java Tue Sep 29 03:48:21 2009
@@ -50,4 +50,9 @@
{
return sstables.iterator();
}
+
+ public synchronized void clearUnsafe()
+ {
+ sstables = Collections.emptySet();
+ }
}
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java?rev=819827&r1=819826&r2=819827&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java Tue Sep 29 03:48:21 2009
@@ -26,6 +26,7 @@
import java.util.Set;
import java.util.HashSet;
import java.util.Arrays;
+import java.util.Collections;
import org.junit.Test;
@@ -43,19 +44,24 @@
for (int i = 0; i < 100; i++)
{
String key = "key" + i;
- RowMutation rm = new RowMutation("Keyspace1", key);
- ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
- cf.addColumn(column("col1", "val1", 1L));
- rm.add(cf);
- rm.apply();
+ insertRow(key);
keys.add(key);
}
table1.getColumnFamilyStore("Standard1").forceBlockingFlush();
table1.getColumnFamilyStore("Standard1").clearUnsafe();
- RecoveryManager.doRecovery();
+ RecoveryManager.doRecovery(); // this is a no-op. is testing this useful?
Set<String> foundKeys = new HashSet<String>(table1.getColumnFamilyStore("Standard1").getKeyRange("", "", 1000).keys);
- assert keys.equals(foundKeys);
+ assert foundKeys.equals(Collections.emptySet());
+ }
+
+ private void insertRow(String key) throws IOException
+ {
+ RowMutation rm = new RowMutation("Keyspace1", key);
+ ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
+ cf.addColumn(column("col1", "val1", 1L));
+ rm.add(cf);
+ rm.apply();
}
}