ignite-sql-tests - fetch next fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b64ab802 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b64ab802 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b64ab802 Branch: refs/heads/ignite-sql-tests Commit: b64ab8023c414dcf1737517bf57d34e6e728c88a Parents: 4420d8a Author: S.Vladykin <[email protected]> Authored: Wed Feb 11 13:34:16 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Wed Feb 11 13:34:16 2015 +0300 ---------------------------------------------------------------------- .../processors/query/h2/twostep/GridReduceQueryExecutor.java | 3 +++ .../internal/processors/query/h2/twostep/GridResultPage.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b64ab802/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index 23c1775..149faba 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@ -135,6 +135,9 @@ public class GridReduceQueryExecutor { idx.addPage(new GridResultPage<UUID>(node.id(), msg) { @Override public void fetchNextPage() { + if (res.isLast()) + return; // No-op if this message known to be the last. + try { ctx.io().sendUserMessage(F.asList(node), new GridNextPageRequest(qryReqId, qry, pageSize), GridTopic.TOPIC_QUERY, false, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b64ab802/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java index b1b45b4..164effc 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java @@ -28,7 +28,7 @@ public class GridResultPage<Z> { private final Z src; /** */ - private final GridNextPageResponse res; + protected final GridNextPageResponse res; /** * @param src Source.
