http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/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 cf86ed7..60ffe59 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -156,7 +156,8 @@ public class ColumnFamilyStoreTest extends CleanupHelper List<Row> result = cfs.getRangeSlice(ByteBufferUtil.EMPTY_BYTE_BUFFER, Util.range(p, "key1", "key2"), 10, - new NamesQueryFilter(ByteBufferUtil.bytes("asdf"))); + new NamesQueryFilter(ByteBufferUtil.bytes("asdf")), + null); assertEquals(1, result.size()); assert result.get(0).key.key.equals(ByteBufferUtil.bytes("key2")); } @@ -188,11 +189,11 @@ public class ColumnFamilyStoreTest extends CleanupHelper // basic single-expression query IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(1L)); - IndexClause clause = new IndexClause(Arrays.asList(expr), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); + List<IndexExpression> clause = Arrays.asList(expr); IFilter filter = new IdentityQueryFilter(); IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); - List<Row> rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").indexManager.search(clause, range, filter); + List<Row> rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").indexManager.search(clause, range, 100, filter); assert rows != null; assert rows.size() == 2 : StringUtils.join(rows, ","); @@ -208,15 +209,15 @@ public class ColumnFamilyStoreTest extends CleanupHelper // add a second expression IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexOperator.GTE, ByteBufferUtil.bytes(2L)); - clause = new IndexClause(Arrays.asList(expr, expr2), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); - rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, filter); + clause = Arrays.asList(expr, expr2); + rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 100, filter); assert rows.size() == 1 : StringUtils.join(rows, ","); key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining()); assert "k3".equals( key ); // same query again, but with resultset not including the subordinate expression - rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, new NamesQueryFilter(ByteBufferUtil.bytes("birthdate"))); + rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 100, new NamesQueryFilter(ByteBufferUtil.bytes("birthdate"))); assert rows.size() == 1 : StringUtils.join(rows, ","); key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining()); @@ -226,7 +227,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper // once more, this time with a slice rowset that needs to be expanded SliceQueryFilter emptyFilter = new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 0); - rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, emptyFilter); + rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 100, emptyFilter); assert rows.size() == 1 : StringUtils.join(rows, ","); key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining()); @@ -237,8 +238,8 @@ public class ColumnFamilyStoreTest extends CleanupHelper // query with index hit but rejected by secondary clause, with a small enough count that just checking count // doesn't tell the scan loop that it's done IndexExpression expr3 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(-1L)); - clause = new IndexClause(Arrays.asList(expr, expr3), ByteBufferUtil.EMPTY_BYTE_BUFFER, 1); - rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, filter); + clause = Arrays.asList(expr, expr3); + rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 100, filter); assert rows.isEmpty(); } @@ -257,11 +258,11 @@ public class ColumnFamilyStoreTest extends CleanupHelper IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(34L)); IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(1L)); - IndexClause clause = new IndexClause(Arrays.asList(expr, expr2), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); + List<IndexExpression> clause = Arrays.asList(expr, expr2); IFilter filter = new IdentityQueryFilter(); IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); - List<Row> rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, filter); + List<Row> rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 100, filter); assert rows != null; assert rows.size() == 50 : rows.size(); @@ -283,11 +284,11 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm.apply(); IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(1L)); - IndexClause clause = new IndexClause(Arrays.asList(expr), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); + List<IndexExpression> clause = Arrays.asList(expr); IFilter filter = new IdentityQueryFilter(); IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); - List<Row> rows = cfs.search(clause, range, filter); + List<Row> rows = cfs.search(clause, range, 100, filter); assert rows.size() == 1 : StringUtils.join(rows, ","); String key = ByteBufferUtil.string(rows.get(0).key.key); assert "k1".equals( key ); @@ -296,22 +297,22 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm = new RowMutation("Keyspace3", ByteBufferUtil.bytes("k1")); rm.delete(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), 1); rm.apply(); - rows = cfs.search(clause, range, filter); + rows = cfs.search(clause, range, 100, filter); assert rows.isEmpty(); // verify that it's not being indexed under the deletion column value either IColumn deletion = rm.getColumnFamilies().iterator().next().iterator().next(); ByteBuffer deletionLong = ByteBufferUtil.bytes((long) ByteBufferUtil.toInt(deletion.value())); IndexExpression expr0 = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, deletionLong); - IndexClause clause0 = new IndexClause(Arrays.asList(expr0), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); - rows = cfs.search(clause0, range, filter); + List<IndexExpression> clause0 = Arrays.asList(expr0); + rows = cfs.search(clause0, range, 100, filter); assert rows.isEmpty(); // resurrect w/ a newer timestamp rm = new RowMutation("Keyspace3", ByteBufferUtil.bytes("k1")); rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), ByteBufferUtil.bytes(1L), 2); rm.apply(); - rows = cfs.search(clause, range, filter); + rows = cfs.search(clause, range, 100, filter); assert rows.size() == 1 : StringUtils.join(rows, ","); key = ByteBufferUtil.string(rows.get(0).key.key); assert "k1".equals( key ); @@ -320,7 +321,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm = new RowMutation("Keyspace3", ByteBufferUtil.bytes("k1")); rm.delete(new QueryPath("Indexed1"), 1); rm.apply(); - rows = cfs.search(clause, range, filter); + rows = cfs.search(clause, range, 100, filter); assert rows.size() == 1 : StringUtils.join(rows, ","); key = ByteBufferUtil.string(rows.get(0).key.key); assert "k1".equals( key ); @@ -329,7 +330,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm = new RowMutation("Keyspace3", ByteBufferUtil.bytes("k1")); rm.delete(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), 1); rm.apply(); - rows = cfs.search(clause, range, filter); + rows = cfs.search(clause, range, 100, filter); assert rows.size() == 1 : StringUtils.join(rows, ","); key = ByteBufferUtil.string(rows.get(0).key.key); assert "k1".equals( key ); @@ -338,14 +339,14 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm = new RowMutation("Keyspace3", ByteBufferUtil.bytes("k1")); rm.delete(new QueryPath("Indexed1"), 3); rm.apply(); - rows = cfs.search(clause, range, filter); + rows = cfs.search(clause, range, 100, filter); assert rows.isEmpty() : StringUtils.join(rows, ","); // make sure obsolete mutations don't generate an index entry rm = new RowMutation("Keyspace3", ByteBufferUtil.bytes("k1")); rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), ByteBufferUtil.bytes(1L), 3); rm.apply(); - rows = cfs.search(clause, range, filter); + rows = cfs.search(clause, range, 100, filter); assert rows.isEmpty() : StringUtils.join(rows, ","); // try insert followed by row delete in the same mutation @@ -353,7 +354,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), ByteBufferUtil.bytes(1L), 1); rm.delete(new QueryPath("Indexed1"), 2); rm.apply(); - rows = cfs.search(clause, range, filter); + rows = cfs.search(clause, range, 100, filter); assert rows.isEmpty() : StringUtils.join(rows, ","); // try row delete followed by insert in the same mutation @@ -361,7 +362,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm.delete(new QueryPath("Indexed1"), 3); rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), ByteBufferUtil.bytes(1L), 4); rm.apply(); - rows = cfs.search(clause, range, filter); + rows = cfs.search(clause, range, 100, filter); assert rows.size() == 1 : StringUtils.join(rows, ","); key = ByteBufferUtil.string(rows.get(0).key.key); assert "k1".equals( key ); @@ -382,16 +383,16 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm.apply(); IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(1L)); - IndexClause clause = new IndexClause(Arrays.asList(expr), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); + List<IndexExpression> clause = Arrays.asList(expr); IFilter filter = new IdentityQueryFilter(); IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); - List<Row> rows = table.getColumnFamilyStore("Indexed1").search(clause, range, filter); + List<Row> rows = table.getColumnFamilyStore("Indexed1").search(clause, range, 100, filter); assert rows.size() == 0; expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(2L)); - clause = new IndexClause(Arrays.asList(expr), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); - rows = table.getColumnFamilyStore("Indexed1").search(clause, range, filter); + clause = Arrays.asList(expr); + rows = table.getColumnFamilyStore("Indexed1").search(clause, range, 100, filter); String key = ByteBufferUtil.string(rows.get(0).key.key); assert "k1".equals( key ); @@ -400,7 +401,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), ByteBufferUtil.bytes(3L), 0); rm.apply(); - rows = table.getColumnFamilyStore("Indexed1").search(clause, range, filter); + rows = table.getColumnFamilyStore("Indexed1").search(clause, range, 100, filter); key = ByteBufferUtil.string(rows.get(0).key.key); assert "k1".equals( key ); @@ -435,11 +436,11 @@ public class ColumnFamilyStoreTest extends CleanupHelper // basic single-expression query IndexExpression expr1 = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(1L)); IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexOperator.GT, ByteBufferUtil.bytes(1L)); - IndexClause clause = new IndexClause(Arrays.asList(new IndexExpression[]{ expr1, expr2 }), ByteBufferUtil.EMPTY_BYTE_BUFFER, 1); + List<IndexExpression> clause = Arrays.asList(new IndexExpression[]{ expr1, expr2 }); IFilter filter = new IdentityQueryFilter(); IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); - List<Row> rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, filter); + List<Row> rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 1, filter); assert rows != null; assert rows.size() == 1 : StringUtils.join(rows, ","); @@ -480,10 +481,10 @@ public class ColumnFamilyStoreTest extends CleanupHelper private void queryBirthdate(Table table) throws CharacterCodingException { IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(1L)); - IndexClause clause = new IndexClause(Arrays.asList(expr), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); + List<IndexExpression> clause = Arrays.asList(expr); IFilter filter = new IdentityQueryFilter(); IPartitioner p = StorageService.getPartitioner(); - List<Row> rows = table.getColumnFamilyStore("Indexed2").search(clause, Util.range("", ""), filter); + List<Row> rows = table.getColumnFamilyStore("Indexed2").search(clause, Util.range("", ""), 100, filter); assert rows.size() == 1 : StringUtils.join(rows, ","); assertEquals("k1", ByteBufferUtil.string(rows.get(0).key.key)); } @@ -497,7 +498,8 @@ public class ColumnFamilyStoreTest extends CleanupHelper List<Row> result = cfs.getRangeSlice(ByteBufferUtil.EMPTY_BYTE_BUFFER, Util.bounds("key1", "key2"), 10, - new NamesQueryFilter(ByteBufferUtil.bytes("asdf"))); + new NamesQueryFilter(ByteBufferUtil.bytes("asdf")), + null); assertEquals(2, result.size()); assert result.get(0).key.key.equals(ByteBufferUtil.bytes("key1")); } @@ -532,7 +534,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper sp.getSlice_range().setStart(ArrayUtils.EMPTY_BYTE_ARRAY); sp.getSlice_range().setFinish(ArrayUtils.EMPTY_BYTE_ARRAY); - assertRowAndColCount(1, 6, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 6, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // deeleet. RowMutation rm = new RowMutation(table.name, key.key); @@ -540,13 +542,13 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm.apply(); // verify delete. - assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // flush cfs.forceBlockingFlush(); // re-verify delete. - assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // late insert. putColsSuper(cfs, key, scfName, @@ -554,14 +556,14 @@ public class ColumnFamilyStoreTest extends CleanupHelper new Column(getBytes(7L), ByteBufferUtil.bytes("val7"), 1L)); // re-verify delete. - assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // 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(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 3, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); } private static void assertRowAndColCount(int rowCount, int colCount, ByteBuffer sc, boolean isDeleted, Collection<Row> rows) throws CharacterCodingException @@ -627,14 +629,14 @@ public class ColumnFamilyStoreTest extends CleanupHelper // insert putColsStandard(cfs, key, column("col1", "val1", 1), column("col2", "val2", 1)); - assertRowAndColCount(1, 2, null, false, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 2, null, false, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // 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(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 4, null, false, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // delete (from sstable and memtable) RowMutation rm = new RowMutation(table.name, key.key); @@ -642,27 +644,27 @@ public class ColumnFamilyStoreTest extends CleanupHelper rm.apply(); // verify delete - assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // flush cfs.forceBlockingFlush(); // re-verify delete. // first breakage is right here because of CASSANDRA-1837. - assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // 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(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // 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(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 2, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); // 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(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()))); + assertRowAndColCount(1, 2, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null)); }
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/test/unit/org/apache/cassandra/db/KeyCollisionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java index f32ffe2..8284371 100644 --- a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java +++ b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java @@ -72,7 +72,7 @@ public class KeyCollisionTest extends CleanupHelper insert("key1", "key2", "key3"); // token = 4 insert("longKey1", "longKey2"); // token = 8 - List<Row> rows = cfs.getRangeSlice(null, new Bounds<RowPosition>(dk("k2"), dk("key2")), 10000, new IdentityQueryFilter()); + List<Row> rows = cfs.getRangeSlice(null, new Bounds<RowPosition>(dk("k2"), dk("key2")), 10000, new IdentityQueryFilter(), null); assert rows.size() == 4 : "Expecting 4 keys, got " + rows.size(); assert rows.get(0).key.key.equals(ByteBufferUtil.bytes("k2")); assert rows.get(1).key.key.equals(ByteBufferUtil.bytes("k3")); http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/test/unit/org/apache/cassandra/db/ScrubTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java index 0e7a2dc..c549d1b 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -94,7 +94,7 @@ public class ScrubTest extends CleanupHelper boolean caught = false; try { - rows = cfs.getRangeSlice(ByteBufferUtil.bytes("1"), Util.range("", ""), 1000, new IdentityQueryFilter()); + rows = cfs.getRangeSlice(ByteBufferUtil.bytes("1"), Util.range("", ""), 1000, new IdentityQueryFilter(), null); fail("This slice should fail"); } catch (NegativeArraySizeException e) @@ -104,7 +104,7 @@ public class ScrubTest extends CleanupHelper assert caught : "'corrupt' test file actually was not"; CompactionManager.instance.performScrub(cfs); - rows = cfs.getRangeSlice(ByteBufferUtil.bytes("1"), Util.range("", ""), 1000, new IdentityQueryFilter()); + rows = cfs.getRangeSlice(ByteBufferUtil.bytes("1"), Util.range("", ""), 1000, new IdentityQueryFilter(), null); assertEquals(100, rows.size()); } @@ -120,13 +120,13 @@ public class ScrubTest extends CleanupHelper // insert data and verify we get it back w/ range query fillCF(cfs, 1); - rows = cfs.getRangeSlice(null, Util.range("", ""), 1000, new IdentityQueryFilter()); + rows = cfs.getRangeSlice(null, Util.range("", ""), 1000, new IdentityQueryFilter(), null); assertEquals(1, rows.size()); CompactionManager.instance.performScrub(cfs); // check data is still there - rows = cfs.getRangeSlice(null, Util.range("", ""), 1000, new IdentityQueryFilter()); + rows = cfs.getRangeSlice(null, Util.range("", ""), 1000, new IdentityQueryFilter(), null); assertEquals(1, rows.size()); } @@ -160,13 +160,13 @@ public class ScrubTest extends CleanupHelper // insert data and verify we get it back w/ range query fillCF(cfs, 10); - rows = cfs.getRangeSlice(null, Util.range("", ""), 1000, new IdentityQueryFilter()); + rows = cfs.getRangeSlice(null, Util.range("", ""), 1000, new IdentityQueryFilter(), null); assertEquals(10, rows.size()); CompactionManager.instance.performScrub(cfs); // check data is still there - rows = cfs.getRangeSlice(null, Util.range("", ""), 1000, new IdentityQueryFilter()); + rows = cfs.getRangeSlice(null, Util.range("", ""), 1000, new IdentityQueryFilter(), null); assertEquals(10, rows.size()); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java index f83e33d..86d9bb4 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -45,7 +45,6 @@ import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.MmappedSegmentedFile; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.thrift.IndexClause; import org.apache.cassandra.thrift.IndexExpression; import org.apache.cassandra.thrift.IndexOperator; import org.apache.cassandra.utils.ByteBufferUtil; @@ -259,10 +258,10 @@ public class SSTableReaderTest extends CleanupHelper // query using index to see if sstable for secondary index opens IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(1L)); - IndexClause clause = new IndexClause(Arrays.asList(expr), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); + List<IndexExpression> clause = Arrays.asList(expr); IPartitioner p = StorageService.getPartitioner(); Range<RowPosition> range = Util.range("", ""); - List<Row> rows = indexedCFS.search(clause, range, new IdentityQueryFilter()); + List<Row> rows = indexedCFS.search(clause, range, 100, new IdentityQueryFilter()); assert rows.size() == 1; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 4a245c2..130b8c8 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -40,7 +40,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.SSTableUtils; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.thrift.IndexClause; import org.apache.cassandra.thrift.IndexExpression; import org.apache.cassandra.thrift.IndexOperator; import org.apache.cassandra.utils.FBUtilities; @@ -154,10 +153,10 @@ public class StreamingTransferTest extends CleanupHelper IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(val)); - IndexClause clause = new IndexClause(Arrays.asList(expr), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); + List<IndexExpression> clause = Arrays.asList(expr); IFilter filter = new IdentityQueryFilter(); Range<RowPosition> range = Util.range("", ""); - List<Row> rows = cfs.search(clause, range, filter); + List<Row> rows = cfs.search(clause, range, 100, filter); assertEquals(1, rows.size()); assert rows.get(0).key.key.equals(ByteBufferUtil.bytes(key)); }
