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/2ed7c6a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ed7c6a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ed7c6a6 Branch: refs/heads/cassandra-3.11 Commit: 2ed7c6a6b8f747806b2dfa8e9919582306ed6522 Parents: 5431b87 60a8cfe Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Sat Nov 17 16:01:39 2018 -0800 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Sat Nov 17 16:01:39 2018 -0800 ---------------------------------------------------------------------- .../org/apache/cassandra/db/SinglePartitionSliceCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ed7c6a6/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java index 1bdbcb2,ca0dfa5..97855a6 --- a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java +++ b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java @@@ -404,11 -395,11 +404,11 @@@ public class SinglePartitionSliceComman SelectStatement stmt = (SelectStatement) QueryProcessor.parseStatement(q).prepare(ClientState.forInternalCalls()).statement; List<Unfiltered> unfiltereds = new ArrayList<>(); - SinglePartitionReadCommand.Group query = (SinglePartitionReadCommand.Group) stmt.getQuery(QueryOptions.DEFAULT, FBUtilities.nowInSeconds()); + SinglePartitionReadCommand.Group query = (SinglePartitionReadCommand.Group) stmt.getQuery(QueryOptions.DEFAULT, 0); Assert.assertEquals(1, query.commands.size()); SinglePartitionReadCommand command = Iterables.getOnlyElement(query.commands); - try (ReadOrderGroup group = ReadOrderGroup.forCommand(command); - UnfilteredPartitionIterator partitions = command.executeLocally(group)) + try (ReadExecutionController controller = ReadExecutionController.forCommand(command); + UnfilteredPartitionIterator partitions = command.executeLocally(controller)) { assert partitions.hasNext(); try (UnfilteredRowIterator partition = partitions.next()) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
