IGNITE-5397: Fixed another issue causing failures on query execution without caches.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1ed088c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1ed088c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1ed088c2 Branch: refs/heads/ignite-5293 Commit: 1ed088c2874345b42bdd97546e94c25657cf00ee Parents: 1d0b076 Author: devozerov <[email protected]> Authored: Mon Jun 5 15:29:24 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Jun 5 15:29:24 2017 +0300 ---------------------------------------------------------------------- .../cache/query/GridCacheTwoStepQuery.java | 1 + .../processors/query/SqlSchemaSelfTest.java | 25 ++++++++++++++++++++ 2 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1ed088c2/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 24958af..4a93aaf 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 @@ -240,6 +240,7 @@ public class GridCacheTwoStepQuery { cp.pageSize = pageSize; cp.distributedJoins = distributedJoins; cp.derivedPartitions = derivedPartitions; + cp.local = local; for (int i = 0; i < mapQrys.size(); i++) cp.mapQrys.add(mapQrys.get(i).copy()); http://git-wip-us.apache.org/repos/asf/ignite/blob/1ed088c2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java index 32636fa..8aaccef 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java @@ -25,6 +25,7 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import java.util.Iterator; import java.util.List; /** @@ -43,6 +44,8 @@ public class SqlSchemaSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { node = (IgniteEx)startGrid(); + + startGrid(2); } /** {@inheritDoc} */ @@ -65,6 +68,17 @@ public class SqlSchemaSelfTest extends GridCommonAbstractTest { assertEquals(1, res.size()); assertEquals(1, res.get(0).size()); assertEquals(1, res.get(0).get(0)); + + Iterator<List<?>> iter = qryProc.querySqlFieldsNoCache(qry, true).iterator(); + + assertTrue(iter.hasNext()); + + List<?> row = iter.next(); + + assertEquals(1, row.size()); + assertEquals(1, row.get(0)); + + assertFalse(iter.hasNext()); } /** @@ -86,6 +100,17 @@ public class SqlSchemaSelfTest extends GridCommonAbstractTest { assertEquals(1, res.size()); assertEquals(1, res.get(0).size()); assertEquals(1, res.get(0).get(0)); + + Iterator<List<?>> iter = qryProc.querySqlFieldsNoCache(qry, true).iterator(); + + assertTrue(iter.hasNext()); + + List<?> row = iter.next(); + + assertEquals(1, row.size()); + assertEquals(1, row.get(0)); + + assertFalse(iter.hasNext()); } /**
