You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/15 08:52:28 UTC
[44/50] [abbrv] ignite git commit: ignite-split2 - partially revert
ignite-split2 - partially revert
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e448d077
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e448d077
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e448d077
Branch: refs/heads/ignite-1232
Commit: e448d077e8660a424fa493ba4397ca2a617d1b20
Parents: b9b983a
Author: S.Vladykin <sv...@gridgain.com>
Authored: Sat Jan 9 15:26:47 2016 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Sat Jan 9 15:26:47 2016 +0300
----------------------------------------------------------------------
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e448d077/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 3319797..409e26f 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
@@ -412,13 +412,11 @@ public class GridReduceQueryExecutor {
) {
String space = cctx.name();
- Collection<ClusterNode> nodes = dataNodes(space, topVer);
+ Set<ClusterNode> nodes = new HashSet<>(dataNodes(space, topVer));
if (F.isEmpty(nodes))
throw new CacheException("Failed to find data nodes for cache: " + space);
- nodes = nodes.size() > 4 ? new HashSet<>(nodes) : new ArrayList<>(nodes);
-
if (!F.isEmpty(extraSpaces)) {
for (String extraSpace : extraSpaces) {
GridCacheContext<?,?> extraCctx = cacheContext(extraSpace);
@@ -482,7 +480,7 @@ public class GridReduceQueryExecutor {
if (!F.isEmpty(m)) {
for (Map.Entry<IgniteProductVersion,Collection<ClusterNode>> entry : m.entrySet()) {
if (entry.getKey().compareTo(DISTRIBUTED_JOIN_SINCE) >= 0)
- break;
+ break;
for (ClusterNode node : entry.getValue()) {
if (!node.isClient() && !node.isDaemon())