You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2017/08/30 16:38:07 UTC

[07/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ad1945e/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 0928ad4,c2598ec..5a8cf67
--- 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 = indexedCFS.indexManager.getBestIndexFor(rc).searcherFor(rc);
+         Index.Searcher searcher = rc.index().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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org