Updated Branches: refs/heads/trunk 10a208973 -> 03e3d15e9
remove unused cruft from test Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03e3d15e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03e3d15e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03e3d15e Branch: refs/heads/trunk Commit: 03e3d15e97b27766c42211b65079ec3794435232 Parents: 10a2089 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Nov 20 20:51:45 2013 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Nov 20 20:51:45 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/ColumnFamilyStoreTest.java | 56 +++++++------------- 1 file changed, 20 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03e3d15e/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index 7f7d5c9..e9d7336 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -48,7 +48,6 @@ import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.LexicalUUIDType; import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.dht.*; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.thrift.*; @@ -76,7 +75,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader @Test // create two sstables, and verify that we only deserialize data from the most recent one - public void testTimeSortedQuery() throws IOException, ExecutionException, InterruptedException + public void testTimeSortedQuery() { Keyspace keyspace = Keyspace.open("Keyspace1"); ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1"); @@ -174,7 +173,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader } @Test - public void testIndexScan() throws IOException + public void testIndexScan() { RowMutation rm; @@ -202,7 +201,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); List<IndexExpression> clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); - IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); List<Row> rows = Keyspace.open("Keyspace1").getColumnFamilyStore("Indexed1").search(range, clause, filter, 100); @@ -256,7 +254,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader } @Test - public void testLargeScan() throws IOException + public void testLargeScan() { RowMutation rm; for (int i = 0; i < 100; i++) @@ -271,7 +269,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); List<IndexExpression> clause = Arrays.asList(expr, expr2); IDiskAtomFilter filter = new IdentityQueryFilter(); - IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); List<Row> rows = Keyspace.open("Keyspace1").getColumnFamilyStore("Indexed1").search(range, clause, filter, 100); @@ -297,7 +294,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); List<IndexExpression> clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); - IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); List<Row> rows = cfs.search(range, clause, filter, 100); assert rows.size() == 1 : StringUtils.join(rows, ","); @@ -396,7 +392,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); List<IndexExpression> clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); - IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); List<Row> rows = keyspace.getColumnFamilyStore("Indexed1").search(range, clause, filter, 100); assert rows.size() == 0; @@ -605,7 +600,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader // See CASSANDRA-2628 @Test - public void testIndexScanWithLimitOne() throws IOException + public void testIndexScanWithLimitOne() { RowMutation rm; @@ -634,7 +629,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexExpression.Operator.GT, ByteBufferUtil.bytes(1L)); List<IndexExpression> clause = Arrays.asList(expr1, expr2); IDiskAtomFilter filter = new IdentityQueryFilter(); - IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); List<Row> rows = Keyspace.open("Keyspace1").getColumnFamilyStore("Indexed1").search(range, clause, filter, 1); @@ -643,7 +637,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader } @Test - public void testIndexCreate() throws IOException, ConfigurationException, InterruptedException, ExecutionException + public void testIndexCreate() throws IOException, InterruptedException, ExecutionException { Keyspace keyspace = Keyspace.open("Keyspace1"); @@ -679,7 +673,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); List<IndexExpression> clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); - IPartitioner p = StorageService.getPartitioner(); List<Row> rows = keyspace.getColumnFamilyStore("Indexed2").search(Util.range("", ""), clause, filter, 100); assert rows.size() == 1 : StringUtils.join(rows, ","); assertEquals("k1", ByteBufferUtil.string(rows.get(0).key.key)); @@ -690,7 +683,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader { ColumnFamilyStore cfs = insertKey1Key2(); - IPartitioner p = StorageService.getPartitioner(); List<Row> result = cfs.getRangeSlice(Util.bounds("key1", "key2"), null, new NamesQueryFilter(ByteBufferUtil.bytes("asdf")), @@ -729,7 +721,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader sp.getSlice_range().setStart(ArrayUtils.EMPTY_BYTE_ARRAY); sp.getSlice_range().setFinish(ArrayUtils.EMPTY_BYTE_ARRAY); - assertRowAndColCount(1, 6, scfName, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); + assertRowAndColCount(1, 6, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); // delete RowMutation rm = new RowMutation(keyspace.getName(), key.key); @@ -737,13 +729,13 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.apply(); // verify delete. - assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); + assertRowAndColCount(1, 0, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); // flush cfs.forceBlockingFlush(); // re-verify delete. - assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); + assertRowAndColCount(1, 0, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); // late insert. putColsSuper(cfs, key, scfName, @@ -751,17 +743,17 @@ public class ColumnFamilyStoreTest extends SchemaLoader new Column(getBytes(7L), ByteBufferUtil.bytes("val7"), 1L)); // re-verify delete. - assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); + assertRowAndColCount(1, 0, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); // make sure new writes are recognized. putColsSuper(cfs, key, scfName, new Column(getBytes(3L), ByteBufferUtil.bytes("val3"), 3), new Column(getBytes(8L), ByteBufferUtil.bytes("val8"), 3), new Column(getBytes(9L), ByteBufferUtil.bytes("val9"), 3)); - assertRowAndColCount(1, 3, scfName, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); + assertRowAndColCount(1, 3, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, scfName), 100)); } - private static void assertRowAndColCount(int rowCount, int colCount, ByteBuffer sc, boolean isDeleted, Collection<Row> rows) throws CharacterCodingException + private static void assertRowAndColCount(int rowCount, int colCount, boolean isDeleted, Collection<Row> rows) throws CharacterCodingException { assert rows.size() == rowCount : "rowcount " + rows.size(); for (Row row : rows) @@ -817,14 +809,14 @@ public class ColumnFamilyStoreTest extends SchemaLoader // insert putColsStandard(cfs, key, column("col1", "val1", 1), column("col2", "val2", 1)); - assertRowAndColCount(1, 2, null, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); + assertRowAndColCount(1, 2, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); // flush. cfs.forceBlockingFlush(); // insert, don't flush putColsStandard(cfs, key, column("col3", "val3", 1), column("col4", "val4", 1)); - assertRowAndColCount(1, 4, null, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); + assertRowAndColCount(1, 4, false, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); // delete (from sstable and memtable) RowMutation rm = new RowMutation(keyspace.getName(), key.key); @@ -832,27 +824,27 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.apply(); // verify delete - assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); + assertRowAndColCount(1, 0, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); // flush cfs.forceBlockingFlush(); // re-verify delete. // first breakage is right here because of CASSANDRA-1837. - assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); + assertRowAndColCount(1, 0, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); // simulate a 'late' insertion that gets put in after the deletion. should get inserted, but fail on read. putColsStandard(cfs, key, column("col5", "val5", 1), column("col2", "val2", 1)); // should still be nothing there because we deleted this row. 2nd breakage, but was undetected because of 1837. - assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); + assertRowAndColCount(1, 0, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); // make sure that new writes are recognized. putColsStandard(cfs, key, column("col6", "val6", 3), column("col7", "val7", 3)); - assertRowAndColCount(1, 2, null, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); + assertRowAndColCount(1, 2, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); // and it remains so after flush. (this wasn't failing before, but it's good to check.) cfs.forceBlockingFlush(); - assertRowAndColCount(1, 2, null, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); + assertRowAndColCount(1, 2, true, cfs.getRangeSlice(Util.range("f", "g"), null, ThriftValidation.asIFilter(sp, cfs.metadata, null), 100)); } @@ -947,11 +939,11 @@ public class ColumnFamilyStoreTest extends SchemaLoader // Test fetching the column by name returns the first column SliceByNamesReadCommand cmd = new SliceByNamesReadCommand(keyspaceName, key.key, cfName, System.currentTimeMillis(), new NamesQueryFilter(cname)); ColumnFamily cf = cmd.getRow(keyspace).cf; - Column column = (Column) cf.getColumn(cname); + Column column = cf.getColumn(cname); assert column.value().equals(ByteBufferUtil.bytes("a")) : "expecting a, got " + ByteBufferUtil.string(column.value()); } - private static void assertTotalColCount(Collection<Row> rows, int expectedCount) throws CharacterCodingException + private static void assertTotalColCount(Collection<Row> rows, int expectedCount) { int columns = 0; for (Row row : rows) @@ -1293,14 +1285,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader assert rows.size() == 10; } - private static String keys(List<Row> rows) throws Throwable - { - String k = ""; - for (Row r : rows) - k += " " + ByteBufferUtil.string(r.key.key); - return k; - } - @SuppressWarnings("unchecked") @Test public void testMultiRangeSomeEmptyNoIndex() throws Throwable