IGNITE-45 - renaimings
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02dcd388 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02dcd388 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02dcd388 Branch: refs/heads/ignite-45 Commit: 02dcd388820b6073284b7b2e3837c4334fc37ee6 Parents: 0106f48 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon Mar 23 17:49:42 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon Mar 23 17:49:42 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../cache/GridCacheConcurrentMap.java | 4 +- .../processors/cache/GridCacheEntrySet.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 2 +- .../cache/GridCacheQueryCommandHandler.java | 6 +-- .../ignite/startup/BasicWarmupClosure.java | 3 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheClearLocallySelfTest.java | 8 ++-- .../GridCacheConcurrentTxMultiNodeTest.java | 3 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../cache/GridCacheLuceneQueryIndexTest.java | 17 ++++---- .../cache/GridCacheOffHeapSelfTest.java | 9 ++-- .../cache/GridCacheP2PUndeploySelfTest.java | 2 +- .../GridCacheQueryInternalKeysSelfTest.java | 2 +- .../cache/GridCacheSwapPreloadSelfTest.java | 2 +- .../IgniteClientAffinityAssignmentSelfTest.java | 4 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 4 +- .../cache/IgnitePutAllLargeBatchSelfTest.java | 8 ++-- ...tAllUpdateNonPreloadedPartitionSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 12 ++--- .../GridCacheClientModesAbstractSelfTest.java | 2 +- ...dCacheMultithreadedFailoverAbstractTest.java | 2 +- .../GridCacheNodeFailureAbstractTest.java | 2 +- ...chePartitionedReloadAllAbstractSelfTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 3 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 7 ++- .../GridCacheSwapScanQueryAbstractSelfTest.java | 12 ++--- ...ridCacheContinuousQueryAbstractSelfTest.java | 10 ++--- .../junits/common/GridCommonAbstractTest.java | 7 ++- .../query/h2/GridH2IndexingGeoSelfTest.java | 8 ++-- .../HibernateAccessStrategyAdapter.java | 2 +- .../cache/hibernate/HibernateRegionFactory.java | 6 +-- .../GridCacheAbstractFieldsQuerySelfTest.java | 46 ++++++++++---------- .../cache/GridCacheCrossCacheQuerySelfTest.java | 11 +++-- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 2 +- .../processors/cache/GridCacheSwapSelfTest.java | 11 +++-- .../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 4 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 12 ++--- ...GridCachePartitionedFieldsQuerySelfTest.java | 2 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 10 ++--- ...cheReduceFieldsQueryPartitionedSelfTest.java | 2 +- .../query/h2/GridH2IndexRebuildTest.java | 17 ++++---- 45 files changed, 136 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 3f75727..d480e1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -2237,7 +2237,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { * @param name Cache name. * @return Cache. */ - public <K, V> GridCache<K, V> cache(@Nullable String name) { + public <K, V> GridCache<K, V> getCache(@Nullable String name) { guard(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index af36feb..dbf1191 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -1746,7 +1746,7 @@ public class GridCacheConcurrentMap { curVal = null; try { - ((IgniteKernal)ctx.grid()).cache(ctx.name()).remove(e.key()); + ((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key()); } catch (IgniteCheckedException ex) { throw new IgniteException(ex); @@ -1920,7 +1920,7 @@ public class GridCacheConcurrentMap { */ boolean removeKey(K k) { try { - return ((IgniteKernal)ctx.grid()).cache(ctx.name()).remove(k, CU.<K, V>empty()); + return ((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(k, CU.<K, V>empty()); } catch (IgniteCheckedException e) { throw new IgniteException("Failed to remove cache entry for key: " + k, e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java index afca283..f530c04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java @@ -79,7 +79,7 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<Cache.Entry<K, V>> { if (F.isAll(e, filter) && set.remove(e)) { try { - ((IgniteKernal)ctx.grid()).cache(ctx.name()).remove(e.getKey(), e.getValue()); + ((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.getKey(), e.getValue()); } catch (IgniteCheckedException ex) { throw new IgniteException(ex); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java index efa4f6f..00647bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -553,7 +553,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { * @throws IgniteCheckedException If cache not found. */ private static GridCacheProjectionEx<Object, Object> cache(Ignite ignite, String cacheName) throws IgniteCheckedException { - GridCache<Object, Object> cache = ((IgniteKernal)ignite).cache(cacheName); + GridCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); if (cache == null) throw new IgniteCheckedException( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java index 5ee6418..93f69c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java @@ -268,7 +268,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter @Override public GridRestResponse call() throws Exception { long qryId = qryIdGen.getAndIncrement(); - CacheQueries<Object,Object> queries = ((IgniteKernal)g).cache(req.cacheName()).queries(); + CacheQueries<Object,Object> queries = ((IgniteKernal)g).getCache(req.cacheName()).queries(); CacheQuery<?> qry; @@ -401,9 +401,9 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter /** {@inheritDoc} */ @Override public Object call() throws Exception { if (clsName == null) - ((IgniteKernal)g).cache(cacheName).queries().rebuildAllIndexes(); + ((IgniteKernal)g).getCache(cacheName).queries().rebuildAllIndexes(); else - ((IgniteKernal)g).cache(cacheName).queries().rebuildIndexes(clsName); + ((IgniteKernal)g).getCache(cacheName).queries().rebuildIndexes(clsName); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java index 8d18c90..1f0b73a 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java @@ -18,7 +18,6 @@ package org.apache.ignite.startup; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; @@ -246,7 +245,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> try { for (CacheConfiguration cc : first.configuration().getCacheConfiguration()) { - GridCache<Object, Object> cache0 = ((IgniteKernal)first).cache(cc.getName()); + GridCache<Object, Object> cache0 = ((IgniteKernal)first).getCache(cc.getName()); for (String warmupMethod : warmupMethods) { Collection<Future> futs = new ArrayList<>(threadCnt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 181e15d..6ae34ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -2970,7 +2970,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Ignite ignite = primaryIgnite(key); - GridCache<String, Integer> cache = ((IgniteKernal)ignite).cache(null); + GridCache<String, Integer> cache = ((IgniteKernal)ignite).getCache(null); cache.put(key, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index eca7008..3aabe63 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -364,7 +364,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked"}) @Override protected GridCache<String, Integer> cache(int idx) { - return ((IgniteKernal)grid(idx)).cache(null); + return ((IgniteKernal)grid(idx)).getCache(null); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java index 1c6c7e9..282529b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java @@ -154,10 +154,10 @@ public class GridCacheClearLocallySelfTest extends GridCommonAbstractTest { if (i == 2) ignite.jcache(CACHE_PARTITIONED); - cachesLoc[i] = ((IgniteKernal)ignite).cache(CACHE_LOCAL); - cachesPartitioned[i] = ((IgniteKernal)ignite).cache(CACHE_PARTITIONED); - cachesColocated[i] = ((IgniteKernal)ignite).cache(CACHE_COLOCATED); - cachesReplicated[i] = ((IgniteKernal)ignite).cache(CACHE_REPLICATED); + cachesLoc[i] = ((IgniteKernal)ignite).getCache(CACHE_LOCAL); + cachesPartitioned[i] = ((IgniteKernal)ignite).getCache(CACHE_PARTITIONED); + cachesColocated[i] = ((IgniteKernal)ignite).getCache(CACHE_COLOCATED); + cachesReplicated[i] = ((IgniteKernal)ignite).getCache(CACHE_REPLICATED); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index f0212bb..1564e3d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.lang.*; @@ -675,7 +674,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { * @return Request. */ private Request findRequestWithMessageId(Long msgId) { - CacheProjection<Object, Request> cache = ((IgniteKernal)ignite).cache(null).projection(Object.class, Request.class); + CacheProjection<Object, Request> cache = ((IgniteKernal)ignite).getCache(null).projection(Object.class, Request.class); CacheQuery<Map.Entry<Object, Request>> qry = cache.queries().createSqlQuery( Request.class, "messageId = ?"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java index 69eb04d..c5b6afa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java @@ -74,7 +74,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra final int logFreq = 50; final String txt = "Value"; - final GridCache<Integer, H2TextValue> c = ((IgniteKernal)grid(0)).cache(null); + final GridCache<Integer, H2TextValue> c = ((IgniteKernal)grid(0)).getCache(null); IgniteInternalFuture<?> fut1 = multithreadedAsync(new Callable() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java index 154bc08..d31568e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -102,8 +101,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex() throws Exception { final Ignite g = startGrid(0); - final GridCache<Integer, ObjectValue> cache1 = ((IgniteKernal)g).cache("local1"); - final GridCache<Integer, ObjectValue> cache2 = ((IgniteKernal)g).cache("local2"); + final GridCache<Integer, ObjectValue> cache1 = ((IgniteKernal)g).getCache("local1"); + final GridCache<Integer, ObjectValue> cache2 = ((IgniteKernal)g).getCache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -159,8 +158,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex1() throws Exception { final Ignite g = startGrid(0); - final GridCache<Integer, ObjectValue> cache1 = ((IgniteKernal)g).cache("local1"); - final GridCache<Integer, ObjectValue> cache2 = ((IgniteKernal)g).cache("local2"); + final GridCache<Integer, ObjectValue> cache1 = ((IgniteKernal)g).getCache("local1"); + final GridCache<Integer, ObjectValue> cache2 = ((IgniteKernal)g).getCache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -230,8 +229,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex2() throws Exception { final Ignite g = startGrid(0); - final GridCache<Integer, ObjectValue> cache1 = ((IgniteKernal)g).cache("local1"); - final GridCache<Integer, ObjectValue> cache2 = ((IgniteKernal)g).cache("local2"); + final GridCache<Integer, ObjectValue> cache1 = ((IgniteKernal)g).getCache("local1"); + final GridCache<Integer, ObjectValue> cache2 = ((IgniteKernal)g).getCache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -303,8 +302,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex3() throws Exception { final Ignite g = startGrid(0); - final GridCache<ObjectKey, ObjectValue> cache1 = ((IgniteKernal)g).cache("local1"); - final GridCache<ObjectKey, ObjectValue> cache2 = ((IgniteKernal)g).cache("local2"); + final GridCache<ObjectKey, ObjectValue> cache1 = ((IgniteKernal)g).getCache("local1"); + final GridCache<ObjectKey, ObjectValue> cache2 = ((IgniteKernal)g).getCache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 6b85355..4a5d63e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -121,8 +120,8 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { Ignite ignite2 = startGrid(2); - GridCache<Integer, Object> cache1 = ((IgniteKernal)ignite1).cache(null); - GridCache<Integer, Object> cache2 = ((IgniteKernal)ignite2).cache(null); + GridCache<Integer, Object> cache1 = ((IgniteKernal)ignite1).getCache(null); + GridCache<Integer, Object> cache2 = ((IgniteKernal)ignite2).getCache(null); Object v1 = new CacheValue(1); @@ -235,7 +234,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_TO_OFFHEAP, EVT_CACHE_OBJECT_FROM_OFFHEAP); - GridCache<Integer, CacheValue> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, CacheValue> cache = ((IgniteKernal)grid(0)).getCache(null); populate(cache); evictAll(cache); @@ -298,7 +297,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { grid(0); - GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); for (int i = 0; i < 100; i++) { info("Putting: " + i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java index 355893c..61e4f9d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -182,7 +182,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { */ private long size(String cacheName, IgniteKernal g) throws IgniteCheckedException { if (offheap) - return ((IgniteKernal)g).cache(cacheName).offHeapEntriesCount(); + return ((IgniteKernal)g).getCache(cacheName).offHeapEntriesCount(); return g.context().swap().swapSize(swapSpaceName(cacheName, g)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java index bc8529e..3b70767 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java @@ -67,7 +67,7 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes @SuppressWarnings("unchecked") public void testInternalKeysPreloading() throws Exception { try { - GridCache<Object, Object> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Object, Object> cache = ((IgniteKernal)grid(0)).getCache(null); for (int i = 0; i < ENTRY_CNT; i++) cache.put(new GridCacheQueueHeaderKey("queue" + i), 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java index 7431dc0..a4ac1da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java @@ -160,7 +160,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { try { startGrid(0); - final GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).cache(null); + final GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java index 1f1b8e8..63bf095 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java @@ -132,14 +132,14 @@ public class IgniteClientAffinityAssignmentSelfTest extends GridCommonAbstractTe * @throws Exception If failed. */ private void checkAffinity() throws Exception { - CacheAffinity<Object> aff = ((IgniteKernal)grid(0)).cache(null).affinity(); + CacheAffinity<Object> aff = ((IgniteKernal)grid(0)).getCache(null).affinity(); for (Ignite grid : Ignition.allGrids()) { try { if (grid.cluster().localNode().id().equals(grid(0).localNode().id())) continue; - CacheAffinity<Object> checkAff = ((IgniteKernal)grid).cache(null).affinity(); + CacheAffinity<Object> checkAff = ((IgniteKernal)grid).getCache(null).affinity(); for (int p = 0; p < PARTS; p++) assertEquals(aff.mapPartitionToPrimaryAndBackups(p), checkAff.mapPartitionToPrimaryAndBackups(p)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java index 716dff4..719a64f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java @@ -419,7 +419,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { - return kernal0.cache(DYNAMIC_CACHE_NAME); + return kernal0.getCache(DYNAMIC_CACHE_NAME); } }, IllegalArgumentException.class, null); } @@ -480,7 +480,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { public Object call() throws Exception { IgniteKernal ignite = (IgniteKernal) grid(nodeCount()); - return ignite.cache(DYNAMIC_CACHE_NAME); + return ignite.getCache(DYNAMIC_CACHE_NAME); } }, IllegalArgumentException.class, null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java index 2278b5c..33410ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java @@ -152,7 +152,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { awaitPartitionMapExchange(); try { - GridCache<Object, Object> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Object, Object> cache = ((IgniteKernal)grid(0)).getCache(null); int keyCnt = 200; @@ -162,7 +162,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { // Create readers if near cache is enabled. for (int g = 1; g < 2; g++) { for (int i = 30; i < 70; i++) - ((IgniteKernal)grid(g)).cache(null).get(i); + ((IgniteKernal)grid(g)).getCache(null).get(i); } info(">>> Starting test tx."); @@ -211,7 +211,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { } for (int g = 0; g < GRID_CNT; g++) { - GridCache<Object, Object> checkCache = ((IgniteKernal)grid(g)).cache(null); + GridCache<Object, Object> checkCache = ((IgniteKernal)grid(g)).getCache(null); ClusterNode checkNode = grid(g).localNode(); @@ -277,7 +277,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { try { Map<Integer, Integer> checkMap = new HashMap<>(); - GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); for (int r = 0; r < 3; r++) { for (int i = 0; i < 10; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java index bef9860..d31c0db 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java @@ -78,7 +78,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA startGrid(GRID_CNT - 1); - GridCache<Object, Object> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Object, Object> cache = ((IgniteKernal)grid(0)).getCache(null); final int keyCnt = 100; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 8865ce8..89baf7f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -29,17 +29,13 @@ import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.resources.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; import java.util.*; @@ -297,7 +293,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe while (true) { CacheQuery<Map.Entry<String, Integer>> qry = - ((IgniteKernal)ignite).<String, Integer>cache(null).queries() + ((IgniteKernal)ignite).<String, Integer>getCache(null).queries() .createSqlQuery(Integer.class, "_key != 'RMVD_CNTR_KEY' and _val >= 0"); if (DEBUG) @@ -619,7 +615,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe startGrids(GRID_CNT); try { - GridCache<String, Integer> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<String, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); cache.put(RMVD_CNTR_KEY, 0); @@ -660,7 +656,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe startGrids(GRID_CNT); try { - GridCache<String, Integer> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<String, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); cache.put(RMVD_CNTR_KEY, 0); @@ -711,7 +707,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe try { startGrids(GRID_CNT); - GridCache<String, Integer> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<String, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); // Store counter. cache.put(RMVD_CNTR_KEY, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index 923eb22..bc79835 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -173,7 +173,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst boolean foundAffinityNode = false; for (int k = 0; k < 10000; k++) { - GridCache<Object, Object> cache = ((IgniteKernal)g).cache(null); + GridCache<Object, Object> cache = ((IgniteKernal)g).getCache(null); String key = "key" + k; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 8d53f93..9f8f43a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -498,7 +498,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra GridCacheAdapter<Integer, Integer> cache0 = (GridCacheAdapter<Integer, Integer>)((IgniteKernal)cache.unwrap(Ignite.class)) - .<Integer, Integer>cache(CACHE_NAME); + .<Integer, Integer>getCache(CACHE_NAME); if (cache0.isNear()) { if (dhtCaches == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index a0119ed..8958132 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -125,7 +125,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac * @return Cache. */ @Override protected <K, V> GridCache<K, V> cache(int i) { - return ((IgniteKernal)IGNITEs.get(i)).cache(null); + return ((IgniteKernal)IGNITEs.get(i)).getCache(null); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index 3444fd2..d0bdbe5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -157,7 +157,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid @Override public void loadCache(IgniteBiInClosure<Integer, String> c, Object... args) { - X.println("Loading all on: " + caches.indexOf(((IgniteKernal)g).<Integer, String>cache(null))); + X.println("Loading all on: " + caches.indexOf(((IgniteKernal)g).<Integer, String>getCache(null))); for (Map.Entry<Integer, String> e : map.entrySet()) c.apply(e.getKey(), e.getValue()); @@ -165,7 +165,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid @Override public String load(Integer key) { X.println("Loading on: " + caches.indexOf(((IgniteKernal)g) - .<Integer, String>cache(null)) + " key=" + key); + .<Integer, String>getCache(null)) + " key=" + key); return map.get(key); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index a2db4cc..034f8d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; @@ -175,7 +174,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - GridCache<Object, MyValue> c2 = ((IgniteKernal)grid(j)).cache("two"); + GridCache<Object, MyValue> c2 = ((IgniteKernal)grid(j)).getCache("two"); CacheQuery<Map.Entry<Object, MyValue>> qry = c2.queries().createScanQuery(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java index 7a6cbea..c51e6b5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated.preloader; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; @@ -177,7 +176,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - GridCache<Object, MyValue> c2 = ((IgniteKernal)grid(j)).cache("two"); + GridCache<Object, MyValue> c2 = ((IgniteKernal)grid(j)).getCache("two"); CacheQuery<Map.Entry<Object, MyValue>> qry = c2.queries().createScanQuery(null); @@ -205,10 +204,10 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa try { Object v1 = e.getValue(); - Object v2 = ((IgniteKernal)grid).cache("one").get(key); + Object v2 = ((IgniteKernal)grid).getCache("one").get(key); assertNotNull("Cache c1 misses value for key [i=" + j0 + ", j=" + i0 + - ", missedKey=" + key + ", cache=" + ((IgniteKernal)grid).cache("one").values() + ']', v2); + ", missedKey=" + key + ", cache=" + ((IgniteKernal)grid).getCache("one").values() + ']', v2); assertEquals(v1, v2); } catch (IgniteCheckedException e1) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index 2ea92e6..fd7e9b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -115,9 +115,9 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ public void testQuery() throws Exception { - checkQuery(((IgniteKernal)grid(0)).cache(ATOMIC_CACHE_NAME)); + checkQuery(((IgniteKernal)grid(0)).getCache(ATOMIC_CACHE_NAME)); - checkQuery(((IgniteKernal)grid(0)).cache(TRANSACTIONAL_CACHE_NAME)); + checkQuery(((IgniteKernal)grid(0)).getCache(TRANSACTIONAL_CACHE_NAME)); } /** @@ -207,9 +207,9 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ public void testQueryPrimitives() throws Exception { - checkQueryPrimitives(((IgniteKernal)grid(0)).cache(ATOMIC_CACHE_NAME)); + checkQueryPrimitives(((IgniteKernal)grid(0)).getCache(ATOMIC_CACHE_NAME)); - checkQueryPrimitives(((IgniteKernal)grid(0)).cache(TRANSACTIONAL_CACHE_NAME)); + checkQueryPrimitives(((IgniteKernal)grid(0)).getCache(TRANSACTIONAL_CACHE_NAME)); } /** @@ -263,9 +263,9 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ public void testQueryValueByteArray() throws Exception { - checkQueryValueByteArray(((IgniteKernal)grid(0)).cache(ATOMIC_CACHE_NAME)); + checkQueryValueByteArray(((IgniteKernal)grid(0)).getCache(ATOMIC_CACHE_NAME)); - checkQueryValueByteArray(((IgniteKernal)grid(0)).cache(TRANSACTIONAL_CACHE_NAME)); + checkQueryValueByteArray(((IgniteKernal)grid(0)).getCache(TRANSACTIONAL_CACHE_NAME)); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index bd5a6d8..18e8a93 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -149,7 +149,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo for (int i = 0; i < gridCount(); i++) { for (int j = 0; j < 5; j++) { try { - GridCache<Object, Object> cache = ((IgniteKernal)grid(i)).cache(null); + GridCache<Object, Object> cache = ((IgniteKernal)grid(i)).getCache(null); for (Cache.Entry<Object, Object> entry : cache.localEntries(new CachePeekMode[] {CachePeekMode.ALL})) { cache.remove(entry.getKey()); @@ -170,9 +170,9 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } for (int i = 0; i < gridCount(); i++) - assertEquals("Cache is not empty [entrySet=" + ((IgniteKernal)grid(i)).cache(null).entrySet() + + assertEquals("Cache is not empty [entrySet=" + ((IgniteKernal)grid(i)).getCache(null).entrySet() + ", i=" + i + ']', - 0, ((IgniteKernal)grid(i)).cache(null).size()); + 0, ((IgniteKernal)grid(i)).getCache(null).size()); for (int i = 0; i < gridCount(); i++) { @@ -419,7 +419,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo public void testLocalNodeOnly() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).jcache(null); - if (((IgniteKernal)grid(0)).cache(null).configuration().getCacheMode() != PARTITIONED) + if (((IgniteKernal)grid(0)).getCache(null).configuration().getCacheMode() != PARTITIONED) return; ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -489,7 +489,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testBuffering() throws Exception { - if (((IgniteKernal)grid(0)).cache(null).configuration().getCacheMode() != PARTITIONED) + if (((IgniteKernal)grid(0)).getCache(null).configuration().getCacheMode() != PARTITIONED) return; IgniteCache<Integer, Integer> cache = grid(0).jcache(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 6f70960..b70f376 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.testframework.junits.common; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; @@ -101,7 +100,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected <K, V> GridCache<K, V> internalCache(int idx) { - return ((IgniteKernal)grid(idx)).cache(null); + return ((IgniteKernal)grid(idx)).getCache(null); } /** @@ -110,14 +109,14 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected <K, V> GridCache<K, V> internalCache(int idx, String cacheName) { - return ((IgniteKernal)grid(idx)).cache(cacheName); + return ((IgniteKernal)grid(idx)).getCache(cacheName); } /** * @return Cache. */ protected <K, V> GridCache<K, V> internalCache() { - return ((IgniteKernal)grid()).cache(null); + return ((IgniteKernal)grid()).getCache(null); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java index b6092cf..89a3186 100644 --- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java +++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java @@ -64,7 +64,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { */ @SuppressWarnings("unchecked") public void testGeo() throws Exception { - GridCache<Integer, EnemyCamp> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, EnemyCamp> cache = ((IgniteKernal)grid(0)).getCache(null); WKTReader r = new WKTReader(); @@ -120,9 +120,9 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { */ @SuppressWarnings("unchecked") public void testGeoMultithreaded() throws Exception { - final GridCache<Integer, EnemyCamp> cache1 = ((IgniteKernal)grid(0)).cache(null); - final GridCache<Integer, EnemyCamp> cache2 = ((IgniteKernal)grid(1)).cache(null); - final GridCache<Integer, EnemyCamp> cache3 = ((IgniteKernal)grid(2)).cache(null); + final GridCache<Integer, EnemyCamp> cache1 = ((IgniteKernal)grid(0)).getCache(null); + final GridCache<Integer, EnemyCamp> cache2 = ((IgniteKernal)grid(1)).getCache(null); + final GridCache<Integer, EnemyCamp> cache3 = ((IgniteKernal)grid(2)).getCache(null); final String[] points = new String[CNT]; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java index bd5dc45..fdff790 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java @@ -342,7 +342,7 @@ public abstract class HibernateAccessStrategyAdapter { /** {@inheritDoc} */ @Override public Void call() throws IgniteCheckedException { - GridCache<Object, Object> cache = ((IgniteKernal)ignite).cache(cacheName); + GridCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java index 478565e..a58f30a 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java @@ -118,7 +118,7 @@ public class HibernateRegionFactory implements RegionFactory { String cacheName = prop.getValue().toString(); - if (((IgniteKernal)ignite).cache(cacheName) == null) + if (((IgniteKernal)ignite).getCache(cacheName) == null) throw new CacheException("Cache '" + cacheName + "' specified for region '" + regionName + "' " + "is not configured."); @@ -129,7 +129,7 @@ public class HibernateRegionFactory implements RegionFactory { String dfltCacheName = props.getProperty(DFLT_CACHE_NAME_PROPERTY); if (dfltCacheName != null) { - dfltCache = ((IgniteKernal)ignite).cache(dfltCacheName); + dfltCache = ((IgniteKernal)ignite).getCache(dfltCacheName); if (dfltCache == null) throw new CacheException("Cache specified as default is not configured: " + dfltCacheName); @@ -214,7 +214,7 @@ public class HibernateRegionFactory implements RegionFactory { cacheName = regionName; } - GridCache<Object, Object> cache = ((IgniteKernal)ignite).cache(cacheName); + GridCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); if (cache == null) throw new CacheException("Cache '" + cacheName + "' for region '" + regionName + "' is not configured."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java index 55ffffd..65bb2af 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java @@ -122,14 +122,14 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs startGrid(gridCount()); - GridCache<String, Organization> orgCache = ((IgniteKernal)grid(0)).cache(null); + GridCache<String, Organization> orgCache = ((IgniteKernal)grid(0)).getCache(null); assert orgCache != null; assert orgCache.putx("o1", new Organization(1, "A")); assert orgCache.putx("o2", new Organization(2, "B")); - GridCache<CacheAffinityKey<String>, Person> personCache = ((IgniteKernal)grid(0)).cache(null); + GridCache<CacheAffinityKey<String>, Person> personCache = ((IgniteKernal)grid(0)).getCache(null); assert personCache != null; @@ -137,20 +137,20 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs assert personCache.putx(new CacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); assert personCache.putx(new CacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); - GridCache<String, String> strCache = ((IgniteKernal)grid(0)).cache(null); + GridCache<String, String> strCache = ((IgniteKernal)grid(0)).getCache(null); assert strCache != null; assert strCache.putx("key", "val"); - GridCache<Integer, Integer> intCache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, Integer> intCache = ((IgniteKernal)grid(0)).getCache(null); assert intCache != null; for (int i = 0; i < 200; i++) assert intCache.putx(i, i); - GridCache<Integer, Integer> namedCache = ((IgniteKernal)grid(0)).cache(CACHE); + GridCache<Integer, Integer> namedCache = ((IgniteKernal)grid(0)).getCache(CACHE); for (int i = 0; i < 200; i++) assert namedCache.putx(i, i); @@ -175,11 +175,11 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testCacheMetaData() throws Exception { // Put internal key to test filtering of internal objects. - ((IgniteKernal)grid(0)).cache(null).put(new GridCacheInternalKeyImpl("LONG"), new GridCacheAtomicLongValue(0)); + ((IgniteKernal)grid(0)).getCache(null).put(new GridCacheInternalKeyImpl("LONG"), new GridCacheAtomicLongValue(0)); try { Collection<GridCacheSqlMetadata> metas = - ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).cache(null).queries()).sqlMetadata(); + ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).getCache(null).queries()).sqlMetadata(); assert metas != null; assertEquals("Invalid meta: " + metas, 3, metas.size()); @@ -260,13 +260,13 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs assert wasEmpty; } finally { - ((IgniteKernal)grid(0)).cache(null).removex(new GridCacheInternalKeyImpl("LONG")); + ((IgniteKernal)grid(0)).getCache(null).removex(new GridCacheInternalKeyImpl("LONG")); } } /** @throws Exception If failed. */ public void testExecute() throws Exception { - CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery( + CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery( "select _KEY, name, age from Person"); CacheQueryFuture<List<?>> fut = qry.execute(); @@ -316,7 +316,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testExecuteWithArguments() throws Exception { - CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery( + CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery( "select _KEY, name, age from Person where age > ?"); CacheQueryFuture<List<?>> fut = qry.execute(30); @@ -361,7 +361,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testExecuteWithMetaData() throws Exception { - CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).cache(null).queries()).createSqlFieldsQuery( + CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).getCache(null).queries()).createSqlFieldsQuery( "select p._KEY, p.name, p.age, o.name " + "from Person p, Organization o where p.orgId = o.id", true); @@ -462,7 +462,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testSelectAllJoined() throws Exception { - CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).cache(null).queries()).createSqlFieldsQuery( + CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).getCache(null).queries()).createSqlFieldsQuery( "select * from Person p, Organization o where p.orgId = o.id", true); @@ -627,7 +627,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testEmptyResult() throws Exception { - CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).cache(null).queries()).createSqlFieldsQuery( + CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).getCache(null).queries()).createSqlFieldsQuery( "select name from Person where age = 0", true); CacheQueryFuture<List<?>> fut = qry.execute(); @@ -655,7 +655,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testQueryString() throws Exception { - CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery("select * from String"); + CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery("select * from String"); Collection<List<?>> res = qry.execute().get(); @@ -672,7 +672,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testQueryIntegersWithJoin() throws Exception { - CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).cache(null).queries()).createSqlFieldsQuery( + CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).getCache(null).queries()).createSqlFieldsQuery( "select i._KEY, i._VAL, j._KEY, j._VAL from Integer i join Integer j where i._VAL >= 100", true) .projection(grid(0).cluster()); @@ -740,7 +740,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testPagination() throws Exception { - CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery("select * from Integer"); + CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery("select * from Integer"); qry.pageSize(20); @@ -762,7 +762,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testNamedCache() throws Exception { - GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).cache(CACHE); + GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).getCache(CACHE); for (int i = 0; i < 200; i++) assert cache.putx(i, i); @@ -778,7 +778,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void _testNoPrimitives() throws Exception { // TODO - GridCache<Object, Object> cache = ((IgniteKernal)grid(0)).cache(CACHE_NO_PRIMITIVES); + GridCache<Object, Object> cache = ((IgniteKernal)grid(0)).getCache(CACHE_NO_PRIMITIVES); assert cache.putx("key", "val"); @@ -797,7 +797,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void _testComplexKeys() throws Exception { // TODO - GridCache<PersonKey, Person> cache = ((IgniteKernal)grid(0)).cache(CACHE_COMPLEX_KEYS); + GridCache<PersonKey, Person> cache = ((IgniteKernal)grid(0)).getCache(CACHE_COMPLEX_KEYS); UUID id = UUID.randomUUID(); @@ -900,7 +900,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs * @throws Exception If failed. */ private void testPaginationIterator(@Nullable String cacheName) throws Exception { - CacheQuery<List<?>> q = ((IgniteKernal)grid(0)).cache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " + + CacheQuery<List<?>> q = ((IgniteKernal)grid(0)).getCache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " + "Integer") .projection(grid(0).cluster()); @@ -933,7 +933,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testPaginationIteratorKeepAll() throws Exception { - CacheQuery<List<?>> q = ((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery( + CacheQuery<List<?>> q = ((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery( "select _key, _val from Integer"); q.pageSize(10); @@ -992,7 +992,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs * @throws Exception If failed. */ private void testPaginationGet(@Nullable String cacheName) throws Exception { - CacheQuery<List<?>> q = ((IgniteKernal)grid(0)).cache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " + + CacheQuery<List<?>> q = ((IgniteKernal)grid(0)).getCache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " + "Integer"); q.pageSize(10); @@ -1020,7 +1020,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testEmptyGrid() throws Exception { - CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery("select name, " + + CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery("select name, " + "age from Person where age = 25"); List<?> res = F.first(qry.execute().get()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 9249f7a..28c2306 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -35,7 +35,6 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheRebalanceMode.*; /** @@ -120,7 +119,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { GridCacheQueriesEx<Integer, FactPurchase> qx = (GridCacheQueriesEx<Integer, FactPurchase>)((IgniteKernal)ignite) - .<Integer, FactPurchase>cache(cache).queries(); + .<Integer, FactPurchase>getCache(cache).queries(); // for (Map.Entry<Integer, FactPurchase> e : qx.createSqlQuery(FactPurchase.class, "1 = 1").execute().get()) // X.println("___ " + e); @@ -140,7 +139,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { public void testTwoStepGroupAndAggregates() throws Exception { GridCacheQueriesEx<Integer, FactPurchase> qx = (GridCacheQueriesEx<Integer, FactPurchase>)((IgniteKernal)ignite) - .<Integer, FactPurchase>cache("partitioned").queries(); + .<Integer, FactPurchase>getCache("partitioned").queries(); Set<Integer> set1 = new HashSet<>(); @@ -295,7 +294,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { private void fillCaches() throws IgniteCheckedException { int idGen = 0; - GridCache<Integer, Object> dimCache = ((IgniteKernal)ignite).cache("replicated"); + GridCache<Integer, Object> dimCache = ((IgniteKernal)ignite).getCache("replicated"); for (int i = 0; i < 2; i++) { int id = idGen++; @@ -312,7 +311,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { CacheProjection<Integer, DimStore> stores = dimCache.projection(Integer.class, DimStore.class); CacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class); - GridCache<Integer, FactPurchase> factCache = ((IgniteKernal)ignite).cache("partitioned"); + GridCache<Integer, FactPurchase> factCache = ((IgniteKernal)ignite).getCache("partitioned"); List<DimStore> dimStores = new ArrayList<>(stores.values()); Collections.sort(dimStores, new Comparator<DimStore>() { @@ -350,7 +349,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { throws Exception { CacheQuery<Map.Entry<Integer, FactPurchase>> qry = (prj == null ? ((IgniteKernal)ignite) - .<Integer, FactPurchase>cache("partitioned") : prj).queries().createSqlQuery(FactPurchase.class, + .<Integer, FactPurchase>getCache("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()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 889c8bc..d5bbfc7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -186,7 +186,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private GridCache<Long, Long> populate() throws Exception { - GridCache<Long, Long> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Long, Long> cache = ((IgniteKernal)grid(0)).getCache(null); assertEquals(0, cache.size()); assertEquals(0, cache.offHeapEntriesCount()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index 2f793f4..aa4768d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -161,8 +160,8 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { Ignite ignite2 = startGrid(2); - GridCache<Integer, Object> cache1 = ((IgniteKernal)ignite1).cache(null); - GridCache<Integer, Object> cache2 = ((IgniteKernal)ignite2).cache(null); + GridCache<Integer, Object> cache1 = ((IgniteKernal)ignite1).getCache(null); + GridCache<Integer, Object> cache2 = ((IgniteKernal)ignite2).getCache(null); Object v1 = new CacheValue(1); @@ -276,7 +275,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED, EVT_SWAP_SPACE_DATA_EVICTED); - GridCache<Integer, CacheValue> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, CacheValue> cache = ((IgniteKernal)grid(0)).getCache(null); for (int i = 0; i< 20; i++) { cache.put(i, new CacheValue(i)); @@ -336,7 +335,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED); - GridCache<Integer, CacheValue> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, CacheValue> cache = ((IgniteKernal)grid(0)).getCache(null); populate(cache); evictAll(cache); @@ -384,7 +383,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { grid(0); - GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); for (int i = 0; i < 100; i++) { info("Putting: " + i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index 7568f26..75cc527 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -91,7 +91,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testQuery() throws Exception { - GridCache<Integer, ObjectValue> cache = ((IgniteKernal)ignite).cache(null); + GridCache<Integer, ObjectValue> cache = ((IgniteKernal)ignite).getCache(null); int cnt = 10; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index 2a2c6b4..51acc1b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -198,7 +198,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testDifferentValueTypes() throws Exception { - GridCache<Integer, Object> cache = ((IgniteKernal)ignite).cache(null); + GridCache<Integer, Object> cache = ((IgniteKernal)ignite).getCache(null); cache.putx(7, "value"); @@ -489,7 +489,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(i, new ObjectValue("test" + i, i)); for (Ignite g : G.allGrids()) { - GridCache<Integer, ObjectValue> c = ((IgniteKernal)g).cache(null); + GridCache<Integer, ObjectValue> c = ((IgniteKernal)g).getCache(null); for (int i = 0; i < cnt; i++) { if (i % 2 == 0) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java index 46fe6f6..e644385 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java @@ -146,7 +146,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes // Clean up all caches. for (int i = 0; i < GRID_CNT; i++) { - GridCache<Object, Object> c = ((IgniteKernal)grid(i)).cache(null); + GridCache<Object, Object> c = ((IgniteKernal)grid(i)).getCache(null); assertEquals(0, c.size()); } @@ -175,7 +175,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes // Clean up all caches. for (int i = 0; i < GRID_CNT; i++) { - GridCache<Object, Object> c = ((IgniteKernal)grid(i)).cache(null); + GridCache<Object, Object> c = ((IgniteKernal)grid(i)).getCache(null); c.removeAll(); @@ -226,7 +226,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes Set<UUID> nodes = new HashSet<>(); for (Cache.Entry<Integer, Integer> entry : entries) - nodes.add(((IgniteKernal)g).cache(null).affinity().mapKeyToPrimaryAndBackups(entry.getKey()).iterator().next().id()); + nodes.add(((IgniteKernal)g).getCache(null).affinity().mapKeyToPrimaryAndBackups(entry.getKey()).iterator().next().id()); return nodes; } @@ -248,7 +248,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final IgniteCache<Integer, String> c = g.jcache(null); final IgniteCache<Integer, Long> cl = g.jcache(null); - assertEquals(0, ((IgniteKernal)g).cache(null).size()); + assertEquals(0, ((IgniteKernal)g).getCache(null).size()); assertEquals(0, c.query(new SqlQuery(String.class, "1 = 1")).getAll().size()); assertEquals(0, cl.query(new SqlQuery(Long.class, "1 = 1")).getAll().size()); @@ -327,7 +327,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final IgniteCache<Integer, Long> c = g.jcache(null); final IgniteCache<Integer, String> c1 = g.jcache(null); - assertEquals(0, ((IgniteKernal)g).cache(null).size()); + assertEquals(0, ((IgniteKernal)g).getCache(null).size()); assertEquals(0, c1.query(new SqlQuery(String.class, "1 = 1")).getAll().size()); assertEquals(0, c.query(new SqlQuery(Long.class, "1 = 1")).getAll().size()); @@ -480,7 +480,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes // Put test values into cache. final IgniteCache<Integer, TestValue> c = g.jcache(null); - assertEquals(0, ((IgniteKernal)g).cache(null).size()); + assertEquals(0, ((IgniteKernal)g).getCache(null).size()); assertEquals(0, c.query(new SqlQuery(TestValue.class, "1 = 1")).getAll().size()); Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java index 2b5e3ad..11b750d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java @@ -63,7 +63,7 @@ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFi * @throws Exception If failed. */ public void testIncludeBackups() throws Exception { - CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery( + CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery( "select _KEY, name, age from Person"); qry.includeBackups(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java index 3311b3d..e038422 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java @@ -66,7 +66,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie Ignite g = startGrid(); - GridCache<Integer, Integer> cache = ((IgniteKernal)g).cache(null); + GridCache<Integer, Integer> cache = ((IgniteKernal)g).getCache(null); CacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery("select _key from Integer where _key >= " + "0 order by _key"); @@ -121,7 +121,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie * @throws Exception If failed. */ public void testLostIterator() throws Exception { - GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).cache(null); + GridCache<Integer, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); CacheQueryFuture<List<?>> fut = null;
