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 2010/02/03 15:46:13 UTC
svn commit: r906073 - in /incubator/cassandra/trunk:
src/java/org/apache/cassandra/db/ test/unit/org/apache/cassandra/
test/unit/org/apache/cassandra/db/ test/unit/org/apache/cassandra/io/
test/unit/org/apache/cassandra/service/
Author: jbellis
Date: Wed Feb 3 14:46:12 2010
New Revision: 906073
URL: http://svn.apache.org/viewvc?rev=906073&view=rev
Log:
make CFS.getKeyRange private; replace w/ getRangeSlice in tests. also clean up test imports.
patch by jbellis
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/Util.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/NameSortTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/ReadResponseResolverTest.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=906073&r1=906072&r2=906073&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 Wed Feb 3 14:46:12 2010
@@ -937,7 +937,7 @@
range_slice. still opens one randomaccessfile per key, which sucks. something like compactioniterator
would be better.
*/
- public RangeReply getKeyRange(final DecoratedKey startWith, final DecoratedKey stopAt, int maxResults)
+ private RangeReply getKeyRange(final DecoratedKey startWith, final DecoratedKey stopAt, int maxResults)
throws IOException, ExecutionException, InterruptedException
{
// create a CollatedIterator that will return unique keys from different sources
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/Util.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/Util.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/Util.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/Util.java Wed Feb 3 14:46:12 2010
@@ -24,10 +24,15 @@
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
-import org.apache.cassandra.db.Column;
-import org.apache.cassandra.db.RowMutation;
+import org.apache.commons.lang.ArrayUtils;
+
+import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.thrift.SliceRange;
public class Util
{
@@ -55,4 +60,15 @@
tmpDir.mkdirs(); // Create the per-keyspace temp directory
return File.createTempFile(colFam + "-", "-Data.db", tmpDir);
}
+
+ public static RangeSliceReply getRangeSlice(ColumnFamilyStore cfs) throws IOException, ExecutionException, InterruptedException
+ {
+ DecoratedKey emptyKey = StorageService.getPartitioner().decorateKey("");
+ return cfs.getRangeSlice(ArrayUtils.EMPTY_BYTE_ARRAY,
+ emptyKey,
+ emptyKey,
+ 10000,
+ new SliceRange(ArrayUtils.EMPTY_BYTE_ARRAY, ArrayUtils.EMPTY_BYTE_ARRAY, false, 10000),
+ null);
+ }
}
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java Wed Feb 3 14:46:12 2010
@@ -25,16 +25,14 @@
import java.util.ArrayList;
import java.util.Set;
import java.util.HashSet;
-import java.util.Collection;
-import org.apache.cassandra.dht.IPartitioner;
-import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.Util;
+
import org.junit.Test;
import org.apache.cassandra.io.SSTableReader;
import org.apache.cassandra.CleanupHelper;
import org.apache.cassandra.db.filter.QueryPath;
-import org.apache.cassandra.db.filter.IdentityQueryFilter;
import org.apache.cassandra.utils.FBUtilities;
import static junit.framework.Assert.assertEquals;
@@ -52,8 +50,6 @@
// this test does enough rows to force multiple block indexes to be used
Table table = Table.open(TABLE1);
ColumnFamilyStore store = table.getColumnFamilyStore("Standard1");
- DecoratedKey emptyKey = StorageService.getPartitioner().decorateKey("");
- assert emptyKey.token.equals(StorageService.getPartitioner().getMinimumToken());
final int ROWS_PER_SSTABLE = 10;
Set<String> inserted = new HashSet<String>();
@@ -66,7 +62,7 @@
inserted.add(key);
}
store.forceBlockingFlush();
- assertEquals(inserted.size(), table.getColumnFamilyStore("Standard1").getKeyRange(emptyKey, emptyKey, 10000).keys.size());
+ assertEquals(inserted.size(), Util.getRangeSlice(store).rows.size());
}
while (true)
{
@@ -78,7 +74,7 @@
{
CompactionManager.instance.submitMajor(store).get();
}
- assertEquals(inserted.size(), table.getColumnFamilyStore("Standard1").getKeyRange(emptyKey, emptyKey, 10000).keys.size());
+ assertEquals(inserted.size(), Util.getRangeSlice(store).rows.size());
}
@Test
@@ -88,7 +84,6 @@
Table table = Table.open(TABLE2);
ColumnFamilyStore store = table.getColumnFamilyStore("Standard1");
- DecoratedKey emptyKey = StorageService.getPartitioner().decorateKey("");
final int ROWS_PER_SSTABLE = 10;
Set<String> inserted = new HashSet<String>();
@@ -101,13 +96,13 @@
inserted.add(key);
}
store.forceBlockingFlush();
- assertEquals(inserted.size(), table.getColumnFamilyStore("Standard1").getKeyRange(emptyKey, emptyKey, 10000).keys.size());
+ assertEquals(inserted.size(), Util.getRangeSlice(store).rows.size());
}
// perform readonly compaction and confirm that no sstables changed
ArrayList<SSTableReader> oldsstables = new ArrayList<SSTableReader>(store.getSSTables());
CompactionManager.instance.submitReadonly(store, LOCAL).get();
assertEquals(oldsstables, new ArrayList<SSTableReader>(store.getSSTables()));
- assertEquals(inserted.size(), table.getColumnFamilyStore("Standard1").getKeyRange(emptyKey, emptyKey, 10000).keys.size());
+ assertEquals(inserted.size(), Util.getRangeSlice(store).rows.size());
}
}
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/NameSortTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/NameSortTest.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/NameSortTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/NameSortTest.java Wed Feb 3 14:46:12 2010
@@ -29,7 +29,7 @@
import org.apache.cassandra.CleanupHelper;
import static org.apache.cassandra.Util.addMutation;
import org.apache.cassandra.db.filter.QueryPath;
-import org.apache.cassandra.db.filter.IdentityQueryFilter;
+
import static junit.framework.Assert.assertEquals;
public class NameSortTest extends CleanupHelper
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java Wed Feb 3 14:46:12 2010
@@ -23,7 +23,8 @@
import java.util.Set;
import java.util.HashSet;
-import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.Util;
+
import org.junit.Test;
import static junit.framework.Assert.assertEquals;
@@ -38,7 +39,6 @@
Table table = Table.open("Keyspace1");
ColumnFamilyStore store = table.getColumnFamilyStore(columnFamilyName);
- DecoratedKey emptyKey = StorageService.getPartitioner().decorateKey("");
Set<String> inserted = new HashSet<String>();
for (int j = 0; j < insertsPerTable; j++) {
@@ -48,7 +48,7 @@
rm.apply();
inserted.add(key);
store.forceBlockingFlush();
- assertEquals(inserted.size(), table.getColumnFamilyStore(columnFamilyName).getKeyRange(emptyKey, emptyKey, 10000).keys.size());
+ assertEquals(inserted.size(), Util.getRangeSlice(store).rows.size());
}
CompactionManager.instance.submitMajor(store).get();
assertEquals(1, store.getSSTables().size());
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=906073&r1=906072&r2=906073&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 Wed Feb 3 14:46:12 2010
@@ -23,11 +23,9 @@
import java.io.IOException;
import java.util.concurrent.ExecutionException;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.Util;
+
import org.junit.Test;
import org.apache.cassandra.CleanupHelper;
@@ -39,7 +37,6 @@
public void testWithFlush() throws IOException, ExecutionException, InterruptedException
{
CompactionManager.instance.disableAutoCompaction();
- DecoratedKey emptyKey = StorageService.getPartitioner().decorateKey("");
for (int i = 0; i < 100; i++)
{
@@ -54,8 +51,7 @@
cfs.clearUnsafe();
RecoveryManager.doRecovery(); // this is a no-op. is testing this useful?
- Set<String> foundKeys = new HashSet<String>(cfs.getKeyRange(emptyKey, emptyKey, 1000).keys);
- assert foundKeys.equals(Collections.emptySet());
+ assert Util.getRangeSlice(cfs).rows.isEmpty();
}
private void insertRow(String key) throws IOException
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java Wed Feb 3 14:46:12 2010
@@ -20,9 +20,6 @@
import java.io.IOException;
import java.util.concurrent.ExecutionException;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.HashSet;
import org.junit.Test;
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java Wed Feb 3 14:46:12 2010
@@ -20,19 +20,19 @@
import java.io.IOException;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
import java.util.Collection;
import org.junit.Test;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertEquals;
+import org.apache.cassandra.Util;
import org.apache.cassandra.db.filter.IdentityQueryFilter;
import org.apache.cassandra.db.filter.NamesQueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
import static org.apache.cassandra.Util.addMutation;
import static org.apache.cassandra.Util.getBytes;
-import org.apache.cassandra.Util;
+
import org.apache.cassandra.CleanupHelper;
import static junit.framework.Assert.assertNotNull;
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java Wed Feb 3 14:46:12 2010
@@ -22,7 +22,6 @@
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertNull;
-import static org.apache.cassandra.Util.column;
import static org.apache.cassandra.Util.getBytes;
import org.apache.cassandra.db.marshal.LongType;
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java Wed Feb 3 14:46:12 2010
@@ -24,10 +24,8 @@
import java.util.*;
import org.apache.cassandra.CleanupHelper;
-import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.db.RangeReply;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.Util;
+import org.apache.cassandra.db.*;
import org.apache.cassandra.io.SSTableUtils;
import org.apache.cassandra.io.SSTableReader;
import org.apache.cassandra.service.StorageService;
@@ -44,7 +42,6 @@
public void testTransferTable() throws Exception
{
StorageService.instance.initServer();
- DecoratedKey emptyKey = StorageService.getPartitioner().decorateKey("");
// write a temporary SSTable, but don't register it
Set<String> content = new HashSet<String>();
@@ -58,8 +55,8 @@
// confirm that the SSTable was transferred and registered
ColumnFamilyStore cfstore = Table.open(tablename).getColumnFamilyStore(cfname);
- RangeReply rr = cfstore.getKeyRange(emptyKey, emptyKey, 2);
- assert rr.keys.size() == 1;
- assert rr.keys.contains("key");
+ RangeSliceReply rr = Util.getRangeSlice(cfstore);
+ assert rr.rows.size() == 1;
+ assert rr.rows.get(0).key.equals("key");
}
}
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/ReadResponseResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/ReadResponseResolverTest.java?rev=906073&r1=906072&r2=906073&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/ReadResponseResolverTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/ReadResponseResolverTest.java Wed Feb 3 14:46:12 2010
@@ -26,7 +26,7 @@
import org.junit.Test;
import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.Row;
+
import static org.apache.cassandra.db.TableTest.assertColumns;
import static org.apache.cassandra.Util.column;
import static junit.framework.Assert.assertNull;