ignite-gg9499 -
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3e62b4eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3e62b4eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3e62b4eb Branch: refs/heads/sprint-1 Commit: 3e62b4eb7be6b91101cb6c09ea10fd5c5c250600 Parents: 193d9b3 Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Dec 19 09:00:29 2014 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Dec 19 09:00:29 2014 +0300 ---------------------------------------------------------------------- .../testsuites/GridUtilSelfTestSuite.java | 1 - .../cache/GridCacheCrossCacheQuerySelfTest.java | 23 ++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e62b4eb/modules/core/src/test/java/org/gridgain/testsuites/GridUtilSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridUtilSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridUtilSelfTestSuite.java index 5c05824..b3eabd4 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridUtilSelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridUtilSelfTestSuite.java @@ -35,7 +35,6 @@ public class GridUtilSelfTestSuite extends TestSuite { suite.addTestSuite(GridThreadPoolExecutorServiceSelfTest.class); suite.addTestSuite(GridUtilsSelfTest.class); suite.addTestSuite(GridSpinReadWriteLockSelfTest.class); - suite.addTestSuite(GridQueueSelfTest.class); suite.addTestSuite(GridStringBuilderFactorySelfTest.class); suite.addTestSuite(GridToStringBuilderSelfTest.class); suite.addTestSuite(GridByteArrayListSelfTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e62b4eb/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 0720c91..bc9dcf8 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -103,14 +103,9 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { } /** - * Fills the caches with data and executes the query. - * - * @param prj Cache projection. - * @throws Exception If failed. - * @return Result. + * @throws IgniteCheckedException If failed. */ - private List<Map.Entry<Integer, FactPurchase>> body(GridCacheProjection<Integer, FactPurchase> prj) - throws Exception { + private void fillCaches() throws IgniteCheckedException { int idGen = 0; GridCache<Integer, Object> dimCache = ignite.cache("replicated"); @@ -155,9 +150,19 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { factCache.put(id, new FactPurchase(id, prod.getId(), store.getId())); } + } - GridCacheQuery<Map.Entry<Integer, FactPurchase>> qry = (prj == null ? factCache : prj).queries().createSqlQuery( - FactPurchase.class, + /** + * Fills the caches with data and executes the query. + * + * @param prj Cache projection. + * @throws Exception If failed. + * @return Result. + */ + private List<Map.Entry<Integer, FactPurchase>> body(GridCacheProjection<Integer, FactPurchase> prj) + throws Exception { + GridCacheQuery<Map.Entry<Integer, FactPurchase>> qry = (prj == null ? + ignite.<Integer, FactPurchase>cache("partitioned") : prj).queries().createSqlQuery(FactPurchase.class, "from \"replicated\".DimStore, \"partitioned\".FactPurchase where DimStore.id = FactPurchase.storeId"); List<Map.Entry<Integer, FactPurchase>> res = new ArrayList<>(qry.execute().get());
