Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02e9846f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02e9846f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02e9846f Branch: refs/heads/trunk Commit: 02e9846f1ab81d5533d1c9951b3de4855ca890c5 Parents: 7ad1945 ded6636 Author: Aleksey Yeschenko <alek...@yeschenko.com> Authored: Wed Aug 30 18:05:09 2017 +0100 Committer: Aleksey Yeschenko <alek...@yeschenko.com> Committed: Wed Aug 30 18:05:09 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/02e9846f/src/java/org/apache/cassandra/db/ReadCommand.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9846f/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/SecondaryIndexTest.java index f2100db,adcb68b..33a5fb6 --- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java @@@ -115,9 -118,8 +115,9 @@@ public class SecondaryIndexTes .filterOn("birthdate", Operator.EQ, 1L) .build(); - Index.Searcher searcher = rc.index().searcherFor(rc); + Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc); - try (ReadOrderGroup orderGroup = rc.startOrderGroup(); UnfilteredPartitionIterator pi = searcher.search(orderGroup)) + try (ReadExecutionController executionController = rc.executionController(); + UnfilteredPartitionIterator pi = searcher.search(executionController)) { assertTrue(pi.hasNext()); pi.next().close(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9846f/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java index 5a8cf67,8eefd29..3d11c18 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@@ -595,11 -604,11 +595,11 @@@ public class SSTableReaderTes .columns("birthdate") .filterOn("birthdate", Operator.EQ, 1L) .build(); - Index.Searcher searcher = rc.index().searcherFor(rc); + Index.Searcher searcher = rc.getIndex(indexedCFS).searcherFor(rc); assertNotNull(searcher); - try (ReadOrderGroup orderGroup = ReadOrderGroup.forCommand(rc)) + try (ReadExecutionController executionController = rc.executionController()) { - assertEquals(1, Util.size(UnfilteredPartitionIterators.filter(searcher.search(orderGroup), rc.nowInSec()))); + assertEquals(1, Util.size(UnfilteredPartitionIterators.filter(searcher.search(executionController), rc.nowInSec()))); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
