Minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/56ce2237 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/56ce2237 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/56ce2237 Branch: refs/heads/master Commit: 56ce2237a87c2285d9e2f2e8ce433ba17d27c64c Parents: 5b774f6 Author: Andrey V. Mashenkov <[email protected]> Authored: Tue Feb 21 12:23:28 2017 +0300 Committer: Andrey V. Mashenkov <[email protected]> Committed: Tue Feb 21 12:52:33 2017 +0300 ---------------------------------------------------------------------- .../processors/query/h2/twostep/GridMapQueryExecutor.java | 7 +++++-- .../processors/query/h2/twostep/GridMergeIndexSorted.java | 4 ++-- .../processors/query/h2/twostep/GridReduceQueryExecutor.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/56ce2237/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java index 72a34a6..f002a5e 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java @@ -458,6 +458,8 @@ public class GridMapQueryExecutor { req.isFlagSet(GridH2QueryRequest.FLAG_IS_LOCAL), req.isFlagSet(GridH2QueryRequest.FLAG_DISTRIBUTED_JOINS)); + final boolean enforceJoinOrder = req.isFlagSet(GridH2QueryRequest.FLAG_ENFORCE_JOIN_ORDER); + for (int i = 1; i < mainCctx.config().getQueryParallelism(); i++) { final int segment = i; @@ -475,6 +477,7 @@ public class GridMapQueryExecutor { req.tables(), req.pageSize(), joinMode, + enforceJoinOrder, req.timeout()); return null; @@ -494,7 +497,7 @@ public class GridMapQueryExecutor { req.tables(), req.pageSize(), joinMode, - req.isFlagSet(GridH2QueryRequest.FLAG_ENFORCE_JOIN_ORDER), + enforceJoinOrder, req.timeout()); } @@ -585,7 +588,7 @@ public class GridMapQueryExecutor { Connection conn = h2.connectionForSpace(mainCctx.name()); // Here we enforce join order to have the same behavior on all the nodes. - h2.setupConnection(conn, distributedJoinMode != OFF, enforceJoinOrder); + setupConnection(conn, distributedJoinMode != OFF, enforceJoinOrder); GridH2QueryContext.set(qctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/56ce2237/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java index a1b6691..32c676d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java @@ -85,8 +85,8 @@ public final class GridMergeIndexSorted extends GridMergeIndex { } /** {@inheritDoc} */ - @Override public void setSources(Collection<ClusterNode> nodes) { - super.setSources(nodes); + @Override public void setSources(Collection<ClusterNode> nodes, int segmentsCnt) { + super.setSources(nodes, segmentsCnt); streamsMap = U.newHashMap(nodes.size()); streams = new RowStream[nodes.size()]; http://git-wip-us.apache.org/repos/asf/ignite/blob/56ce2237/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 3cfaae9..4cae6ac 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 @@ -624,7 +624,7 @@ public class GridReduceQueryExecutor { if (distributedJoins) flags |= GridH2QueryRequest.FLAG_DISTRIBUTED_JOINS; - if(qry.isLocal()) + if (qry.isLocal()) flags |= GridH2QueryRequest.FLAG_IS_LOCAL; if (send(nodes,
