Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c84269a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c84269a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c84269a3 Branch: refs/heads/trunk Commit: c84269a3919109a0a4b899c79b91842de5c1be8b Parents: 3e4d000 02e9846 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Aug 30 18:05:30 2017 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Aug 30 18:05:30 2017 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ReadCommand.java | 13 ------------- .../org/apache/cassandra/db/SecondaryIndexTest.java | 10 +++++----- .../apache/cassandra/io/sstable/SSTableReaderTest.java | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c84269a3/src/java/org/apache/cassandra/db/ReadCommand.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c84269a3/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/SecondaryIndexTest.java index df5e7ce,33a5fb6..38b0a39 --- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java @@@ -204,10 -202,10 +204,10 @@@ public class SecondaryIndexTes // verify that it's not being indexed under any other value either ReadCommand rc = Util.cmd(cfs).build(); - assertNull(rc.index()); + assertNull(rc.getIndex(cfs)); // resurrect w/ a newer timestamp - new RowUpdateBuilder(cfs.metadata, 2, "k1").clustering("c").add("birthdate", 1L).build().apply();; + new RowUpdateBuilder(cfs.metadata(), 2, "k1").clustering("c").add("birthdate", 1L).build().apply();; assertIndexedOne(cfs, col, 1L); // verify that row and delete w/ older timestamp does nothing @@@ -220,15 -218,15 +220,15 @@@ // delete the entire row (w/ newer timestamp this time) // todo - checking the # of index searchers for the command is probably not the best thing to test here - RowUpdateBuilder.deleteRow(cfs.metadata, 3, "k1", "c").applyUnsafe(); + RowUpdateBuilder.deleteRow(cfs.metadata(), 3, "k1", "c").applyUnsafe(); rc = Util.cmd(cfs).build(); - assertNull(rc.index()); + assertNull(rc.getIndex(cfs)); // make sure obsolete mutations don't generate an index entry // todo - checking the # of index searchers for the command is probably not the best thing to test here - new RowUpdateBuilder(cfs.metadata, 3, "k1").clustering("c").add("birthdate", 1L).build().apply();; + new RowUpdateBuilder(cfs.metadata(), 3, "k1").clustering("c").add("birthdate", 1L).build().apply();; rc = Util.cmd(cfs).build(); - assertNull(rc.index()); + assertNull(rc.getIndex(cfs)); } @Test @@@ -533,10 -520,10 +533,10 @@@ } private void assertIndexedCount(ColumnFamilyStore cfs, ByteBuffer col, Object val, int count) { - ColumnDefinition cdef = cfs.metadata.getColumnDefinition(col); + ColumnMetadata cdef = cfs.metadata().getColumn(col); ReadCommand rc = Util.cmd(cfs).filterOn(cdef.name.toString(), Operator.EQ, ((AbstractType) cdef.cellValueType()).decompose(val)).build(); - Index.Searcher searcher = rc.index().searcherFor(rc); + Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc); if (count != 0) assertNotNull(searcher); http://git-wip-us.apache.org/repos/asf/cassandra/blob/c84269a3/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
