You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/05/17 14:01:40 UTC
[6/9] ignite git commit: Removing extra spaces.
Removing extra spaces.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/745b8ac0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/745b8ac0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/745b8ac0
Branch: refs/heads/ignite-5054-splitter-2
Commit: 745b8ac0b0631e8269a6809efc8f6bb0a33795be
Parents: 40571fa
Author: devozerov <vo...@gridgain.com>
Authored: Wed May 17 14:40:52 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed May 17 14:40:52 2017 +0300
----------------------------------------------------------------------
.../processors/cache/query/GridCacheTwoStepQuery.java | 1 -
.../query/h2/twostep/GridReduceQueryExecutor.java | 13 +++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/745b8ac0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
index 80ba0ff..b5d8381 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
@@ -228,7 +228,6 @@ public class GridCacheTwoStepQuery {
GridCacheTwoStepQuery cp = new GridCacheTwoStepQuery(originalSql, tbls);
cp.caches = caches;
- cp.extraCaches = extraCaches;
cp.rdc = rdc.copy();
cp.skipMergeTbl = skipMergeTbl;
cp.pageSize = pageSize;
http://git-wip-us.apache.org/repos/asf/ignite/blob/745b8ac0/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 1e07fee..d275826 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
@@ -536,8 +536,6 @@ public class GridReduceQueryExecutor {
final boolean isReplicatedOnly = qry.isReplicatedOnly();
// Fail if all caches are replicated and explicit partitions are set.
-
-
for (int attempt = 0;; attempt++) {
if (attempt != 0) {
try {
@@ -571,19 +569,18 @@ public class GridReduceQueryExecutor {
Map<ClusterNode, IntArray> qryMap = null;
// Partitions are not supported for queries over all replicated caches.
- if (cctx.isReplicated() && parts != null) {
- boolean failIfReplicatedOnly = true;
+ if (parts != null) {
+ boolean replicatedOnly = true;
- // TOD: Use normal caches
- for (Integer cacheId : extraSpaces) {
+ for (Integer cacheId : qry.caches()) {
if (!cacheContext(cacheId).isReplicated()) {
- failIfReplicatedOnly = false;
+ replicatedOnly = false;
break;
}
}
- if (failIfReplicatedOnly)
+ if (replicatedOnly)
throw new CacheException("Partitions are not supported for replicated caches");
}