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/521542ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/521542ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/521542ff Branch: refs/heads/trunk Commit: 521542ff26f9482b733e4f0f86281f07c3af29da Parents: f22fec9 2ed7c6a Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Sat Nov 17 16:09:00 2018 -0800 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Sat Nov 17 16:09:00 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/521542ff/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java index f28bf41,97855a6..5dd408b --- a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java +++ b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java @@@ -339,12 -401,12 +339,12 @@@ public class SinglePartitionSliceComman public static List<Unfiltered> getUnfilteredsFromSinglePartition(String q) { - SelectStatement stmt = (SelectStatement) QueryProcessor.parseStatement(q).prepare(ClientState.forInternalCalls()).statement; + SelectStatement stmt = (SelectStatement) QueryProcessor.parseStatement(q).prepare(ClientState.forInternalCalls()); List<Unfiltered> unfiltereds = new ArrayList<>(); - SinglePartitionReadQuery.Group<SinglePartitionReadCommand> query = (SinglePartitionReadQuery.Group<SinglePartitionReadCommand>) 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); ++ SinglePartitionReadQuery.Group<SinglePartitionReadCommand> query = (SinglePartitionReadQuery.Group<SinglePartitionReadCommand>) stmt.getQuery(QueryOptions.DEFAULT, 0); + Assert.assertEquals(1, query.queries.size()); + SinglePartitionReadCommand command = Iterables.getOnlyElement(query.queries); try (ReadExecutionController controller = ReadExecutionController.forCommand(command); UnfilteredPartitionIterator partitions = command.executeLocally(controller)) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
