Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AC015200C62 for ; Wed, 26 Apr 2017 19:38:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AAA2A160BB4; Wed, 26 Apr 2017 17:38:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7AAAD160BA8 for ; Wed, 26 Apr 2017 19:38:13 +0200 (CEST) Received: (qmail 40282 invoked by uid 500); 26 Apr 2017 17:38:12 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 39365 invoked by uid 99); 26 Apr 2017 17:38:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Apr 2017 17:38:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04BD6E3823; Wed, 26 Apr 2017 17:38:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Wed, 26 Apr 2017 17:38:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [33/51] [abbrv] ignite git commit: IGNITE-3488: Prohibited null as cache name. This closes #1790. archived-at: Wed, 26 Apr 2017 17:38:16 -0000 http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index 396083e..a91c5b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -127,7 +127,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final IgniteCache cache = ignite.cache(null); + final IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); final Random rnd = new Random(); @@ -182,7 +182,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final IgniteCache cache = ignite.cache(null); + final IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); for (int i = 0; i < 100; i++) cache.put(i, i); @@ -212,7 +212,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final IgniteCache cache = ignite.cache(null); + final IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); Collection keys = new ArrayList<>(100); @@ -247,7 +247,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final IgniteCache cache = ignite.cache(null); + final IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); for (int i = 0; i < 10000; i++) load(cache, i, true); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java index 0eb7a42..33ec6d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java @@ -56,7 +56,7 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration c = super.getConfiguration(igniteInstanceName); - CacheConfiguration cc = new CacheConfiguration(); + CacheConfiguration cc = new CacheConfiguration(DEFAULT_CACHE_NAME); cc.setCacheMode(PARTITIONED); cc.setAtomicityMode(atomicityMode); @@ -115,7 +115,7 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { info("Inserting " + cnt + " keys to cache."); - try (IgniteDataStreamer ldr = grid(0).dataStreamer(null)) { + try (IgniteDataStreamer ldr = grid(0).dataStreamer(DEFAULT_CACHE_NAME)) { for (int i = 0; i < cnt; i++) ldr.addData(i, Integer.toString(i)); } @@ -127,7 +127,7 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { info("Getting " + cnt + " keys from cache."); for (int i = 0; i < cnt; i++) { - IgniteCache cache = grid(rand.nextInt(GRID_COUNT)).cache(null); + IgniteCache cache = grid(rand.nextInt(GRID_COUNT)).cache(DEFAULT_CACHE_NAME); assertTrue(cache.get(i).equals(Integer.toString(i))); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java index 5b0a12c..90f007a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java @@ -73,7 +73,7 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes if (cnt == 0) c.setClientMode(true); else { - CacheConfiguration cc = new CacheConfiguration(); + CacheConfiguration cc = new CacheConfiguration(DEFAULT_CACHE_NAME); cc.setCacheMode(cacheMode); cc.setAtomicityMode(atomicityMode); @@ -146,13 +146,13 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes nearCfg.setNearEvictionPolicy(plc); - grid(0).createNearCache(null, nearCfg); + grid(0).createNearCache(DEFAULT_CACHE_NAME, nearCfg); int cnt = 1000; info("Inserting " + cnt + " keys to cache."); - try (IgniteDataStreamer ldr = grid(1).dataStreamer(null)) { + try (IgniteDataStreamer ldr = grid(1).dataStreamer(DEFAULT_CACHE_NAME)) { for (int i = 0; i < cnt; i++) ldr.addData(i, Integer.toString(i)); } @@ -163,7 +163,7 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes info("Getting " + cnt + " keys from cache."); for (int i = 0; i < cnt; i++) { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); assertTrue(cache.get(i).equals(Integer.toString(i))); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionAbstractTest.java index 20edd4e..3aee941 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionAbstractTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.NotNull; /** * @@ -102,13 +103,13 @@ public class PageEvictionAbstractTest extends GridCommonAbstractTest { * @return Cache configuration. */ protected static CacheConfiguration cacheConfig( - String name, + @NotNull String name, String memoryPlcName, CacheMode cacheMode, CacheAtomicityMode atomicityMode, CacheWriteSynchronizationMode writeSynchronizationMode ) { - CacheConfiguration cacheConfiguration = new CacheConfiguration<>() + CacheConfiguration cacheConfiguration = new CacheConfiguration<>(DEFAULT_CACHE_NAME) .setName(name) .setAffinity(new RendezvousAffinityFunction(false, 32)) .setCacheMode(cacheMode) http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java index a3a61a2..f7ad491 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java @@ -99,7 +99,7 @@ public class SortedEvictionPolicyPerformanceTest extends GridCommonAbstractTest final int pPut = P_PUT; final int pGet = P_PUT + P_GET; - final IgniteCache cache = ignite.cache(null); + final IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); multithreadedAsync(new Callable() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java index 44ff4ab..3acdf9f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java @@ -86,7 +86,7 @@ public class IgniteCacheClientNearCacheExpiryTest extends IgniteCacheAbstractTes assertTrue(ignite.configuration().isClientMode()); - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); assertTrue(((IgniteCacheProxy)cache).context().isNear()); @@ -109,7 +109,7 @@ public class IgniteCacheClientNearCacheExpiryTest extends IgniteCacheAbstractTes // Check size of near entries via reflection because entries is filtered for size() API call. IgniteEx igniteEx = (IgniteEx)ignite; GridCacheConcurrentMap map = GridTestUtils.getFieldValue( - ((GridCacheProxyImpl)igniteEx.cachex(null)).delegate(), + ((GridCacheProxyImpl)igniteEx.cachex(DEFAULT_CACHE_NAME)).delegate(), GridCacheAdapter.class, "map"); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 5d01716..8ef7281 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -135,13 +135,13 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs info("PUT DONE"); } - long pSize = grid(0).context().cache().internalCache(null).context().ttl().pendingSize(); + long pSize = grid(0).context().cache().internalCache(DEFAULT_CACHE_NAME).context().ttl().pendingSize(); assertTrue("Too many pending entries: " + pSize, pSize <= 1); cache.remove(key); - pSize = grid(0).context().cache().internalCache(null).context().ttl().pendingSize(); + pSize = grid(0).context().cache().internalCache(DEFAULT_CACHE_NAME).context().ttl().pendingSize(); assertEquals(0, pSize); } @@ -996,7 +996,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs checkTtl(key, 60_000L); IgniteCache cache = - grid(0).affinity(null).isPrimary(grid(1).localNode(), key) ? jcache(1) : jcache(2); + grid(0).affinity(DEFAULT_CACHE_NAME).isPrimary(grid(1).localNode(), key) ? jcache(1) : jcache(2); assertEquals(1, cache.get(key)); @@ -1024,7 +1024,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs Ignite client = startGrid("client", clientCfg); - IgniteCache cache = client.cache(null); + IgniteCache cache = client.cache(DEFAULT_CACHE_NAME); Integer key = 1; @@ -1194,7 +1194,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs for (int i = 0; i < gridCount(); i++) { IgniteKernal grid = (IgniteKernal)grid(i); - GridCacheAdapter cache = grid.context().cache().internalCache(); + GridCacheAdapter cache = grid.context().cache().internalCache(DEFAULT_CACHE_NAME); if (cache.context().isNear()) cache = cache.context().near().dht(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java index 54357a0..2b8a9ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java @@ -296,7 +296,7 @@ public abstract class IgniteCacheExpiryPolicyWithStoreAbstractTest extends Ignit for (int i = 0; i < gridCount(); i++) { IgniteKernal grid = (IgniteKernal)grid(i); - GridCacheAdapter cache = grid.context().cache().internalCache(); + GridCacheAdapter cache = grid.context().cache().internalCache(DEFAULT_CACHE_NAME); GridCacheEntryEx e = null; @@ -317,9 +317,9 @@ public abstract class IgniteCacheExpiryPolicyWithStoreAbstractTest extends Ignit if (e == null) { if (primaryOnly) - assertTrue("Not found " + key, !grid.affinity(null).isPrimary(grid.localNode(), key)); + assertTrue("Not found " + key, !grid.affinity(DEFAULT_CACHE_NAME).isPrimary(grid.localNode(), key)); else - assertTrue("Not found " + key, !grid.affinity(null).isPrimaryOrBackup(grid.localNode(), key)); + assertTrue("Not found " + key, !grid.affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid.localNode(), key)); } else { found = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheLargeValueExpireTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheLargeValueExpireTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheLargeValueExpireTest.java index 1017a67..71d809a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheLargeValueExpireTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheLargeValueExpireTest.java @@ -76,14 +76,14 @@ public class IgniteCacheLargeValueExpireTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkExpire(Ignite ignite, boolean eagerTtl) throws Exception { - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setEagerTtl(eagerTtl); ignite.createCache(ccfg); try { IgniteCache cache = - ignite.cache(null).withExpiryPolicy(new TouchedExpiryPolicy(new Duration(0, 500))); + ignite.cache(DEFAULT_CACHE_NAME).withExpiryPolicy(new TouchedExpiryPolicy(new Duration(0, 500))); ThreadLocalRandom rnd = ThreadLocalRandom.current(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheOnlyOneTtlCleanupThreadExistsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheOnlyOneTtlCleanupThreadExistsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheOnlyOneTtlCleanupThreadExistsTest.java index 84f5144..f47de7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheOnlyOneTtlCleanupThreadExistsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheOnlyOneTtlCleanupThreadExistsTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.Ignite; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.NotNull; /** * Checks that one and only one Ttl cleanup worker thread must exists, and only @@ -70,8 +71,8 @@ public class IgniteCacheOnlyOneTtlCleanupThreadExistsTest extends GridCommonAbst * @param eagerTtl Eager ttl falg. * @return Cache configuration. */ - private CacheConfiguration createCacheConfiguration(String name, boolean eagerTtl) { - CacheConfiguration ccfg = new CacheConfiguration(); + private CacheConfiguration createCacheConfiguration(@NotNull String name, boolean eagerTtl) { + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setEagerTtl(eagerTtl); ccfg.setName(name); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTtlCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTtlCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTtlCleanupSelfTest.java index e162c93..9d21823 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTtlCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTtlCleanupSelfTest.java @@ -59,13 +59,13 @@ public class IgniteCacheTtlCleanupSelfTest extends GridCacheAbstractSelfTest { * @throws Exception If failed. */ public void testDeferredDeleteTtl() throws Exception { - IgniteCache cache = grid(0).cache(null) + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME) .withExpiryPolicy(new CreatedExpiryPolicy(new Duration(TimeUnit.SECONDS, 5))); int cnt = GridDhtLocalPartition.MAX_DELETE_QUEUE_SIZE / PART_NUM + 100; for (long i = 0; i < cnt; i++) - grid(0).cache(null).put(i * PART_NUM, i); + grid(0).cache(DEFAULT_CACHE_NAME).put(i * PART_NUM, i); for (int i = 0; i < cnt; i++) cache.put(i * PART_NUM, i); @@ -73,9 +73,9 @@ public class IgniteCacheTtlCleanupSelfTest extends GridCacheAbstractSelfTest { // Wait 5 seconds. Thread.sleep(6_000); - assertEquals(cnt, grid(0).cache(null).size()); + assertEquals(cnt, grid(0).cache(DEFAULT_CACHE_NAME).size()); - GridCacheAdapter cacheAdapter = ((IgniteKernal)grid(0)).internalCache(null); + GridCacheAdapter cacheAdapter = ((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME); IgniteCacheObjectProcessor cacheObjects = cacheAdapter.context().cacheObjects(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java index d072692..2e9753f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java @@ -174,7 +174,7 @@ public abstract class IgniteCacheLoadAllAbstractTest extends IgniteCacheAbstract * @param expVals Expected values. */ private void checkValues(int keys, Map expVals) { - Affinity aff = grid(0).affinity(null); + Affinity aff = grid(0).affinity(DEFAULT_CACHE_NAME); for (int i = 0; i < gridCount(); i++) { ClusterNode node = ignite(i).cluster().localNode(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java index cde1a89..40e36c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java @@ -41,6 +41,7 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.resources.CacheStoreSessionResource; import org.apache.ignite.resources.IgniteInstanceResource; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -113,7 +114,7 @@ public abstract class IgniteCacheStoreSessionAbstractTest extends IgniteCacheAbs * @throws Exception If failed. */ public void testStoreSession() throws Exception { - assertNull(jcache(0).getName()); + assertEquals(DEFAULT_CACHE_NAME, jcache(0).getName()); assertEquals(CACHE_NAME1, ignite(0).cache(CACHE_NAME1).getName()); @@ -227,7 +228,7 @@ public abstract class IgniteCacheStoreSessionAbstractTest extends IgniteCacheAbs * @param expProps Expected properties. * @param expCacheName Expected cache name. */ - ExpectedData(boolean tx, String expMtd, Map expProps, String expCacheName) { + ExpectedData(boolean tx, String expMtd, Map expProps, @NotNull String expCacheName) { this.tx = tx; this.expMtd = expMtd; this.expProps = expProps; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java index 53d9849..dcbb63f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java @@ -106,7 +106,7 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign * @throws Exception If failed. */ public void testSession() throws Exception { - testCache(null); + testCache(DEFAULT_CACHE_NAME); testCache(CACHE_NAME1); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java index 6424b8b..b9e884b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java @@ -110,9 +110,9 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache.remove(key3); - expData.add(new ExpectedData(true, "writeAll", new HashMap<>(), null)); - expData.add(new ExpectedData(true, "delete", F.asMap(0, "writeAll"), null)); - expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "writeAll", 1, "delete"), null)); + expData.add(new ExpectedData(true, "writeAll", new HashMap<>(), DEFAULT_CACHE_NAME)); + expData.add(new ExpectedData(true, "delete", F.asMap(0, "writeAll"), DEFAULT_CACHE_NAME)); + expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "writeAll", 1, "delete"), DEFAULT_CACHE_NAME)); log.info("Do tx commit."); @@ -206,8 +206,8 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache.remove(key1, key1); - expData.add(new ExpectedData(true, "delete", new HashMap<>(), null)); - expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "delete"), null)); + expData.add(new ExpectedData(true, "delete", new HashMap<>(), DEFAULT_CACHE_NAME)); + expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "delete"), DEFAULT_CACHE_NAME)); log.info("Do tx commit."); @@ -228,8 +228,8 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache.remove(key3, key3); - expData.add(new ExpectedData(true, "deleteAll", new HashMap<>(), null)); - expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "deleteAll"), null)); + expData.add(new ExpectedData(true, "deleteAll", new HashMap<>(), DEFAULT_CACHE_NAME)); + expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "deleteAll"), DEFAULT_CACHE_NAME)); log.info("Do tx commit."); @@ -257,7 +257,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra * @throws Exception If failed. */ public void testSessionCrossCacheTx() throws Exception { - IgniteCache cache0 = ignite(0).cache(null); + IgniteCache cache0 = ignite(0).cache(DEFAULT_CACHE_NAME); IgniteCache cache1 = ignite(0).cache(CACHE_NAME1); @@ -269,9 +269,9 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache1.put(key2, 0); - expData.add(new ExpectedData(true, "write", new HashMap<>(), null)); + expData.add(new ExpectedData(true, "write", new HashMap<>(), DEFAULT_CACHE_NAME)); expData.add(new ExpectedData(true, "write", F.asMap(0, "write"), CACHE_NAME1)); - expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "write", 1, "write"), null)); + expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "write", 1, "write"), DEFAULT_CACHE_NAME)); tx.commit(); } @@ -284,7 +284,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache0.put(key2, 0); expData.add(new ExpectedData(true, "write", new HashMap<>(), CACHE_NAME1)); - expData.add(new ExpectedData(true, "write", F.asMap(0, "write"), null)); + expData.add(new ExpectedData(true, "write", F.asMap(0, "write"), DEFAULT_CACHE_NAME)); expData.add(new ExpectedData(true, "sessionEnd", F.asMap(0, "write", 1, "write"), CACHE_NAME1)); tx.commit(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java index fa21de9..1f42a6f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java @@ -30,7 +30,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL * @throws Exception If failed. */ public void testEntryProcessorRemove() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); cache.put(1, 20); @@ -64,7 +64,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL * @throws Exception If failed. */ public void testCacheStatistics() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); cache.put(1, 10); @@ -104,7 +104,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL * @throws Exception If failed. */ public void testConditionReplace() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); long hitCount = 0; long missCount = 0; @@ -154,7 +154,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL * @throws Exception If failed. */ public void testPutIfAbsent() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); long hitCount = 0; long missCount = 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index 1ad8d75..c206c22 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -53,7 +53,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte c.getTransactionConfiguration().setTxSerializableEnabled(true); - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setName(CACHE_REGULAR); ccfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java index ae34cb6..0c7a217 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java @@ -56,7 +56,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT cache.put("key1", 1); cache.put("key2", 2); - Map> map = grid(0).affinity(null).mapKeysToNodes(F.asList("key1", "key2")); + Map> map = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(F.asList("key1", "key2")); assert map.size() == 1; @@ -68,7 +68,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT for (String key : keys) assert "key1".equals(key) || "key2".equals(key); - map = grid(0).affinity(null).mapKeysToNodes(F.asList("key1", "key2")); + map = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(F.asList("key1", "key2")); assert map.size() == 1; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java index a871182..f4160ed 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java @@ -81,7 +81,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If test failed. */ public void testLockReentry() throws IgniteCheckedException { - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); assert !cache.isLocalLocked(1, false); assert !cache.isLocalLocked(1, true); @@ -126,7 +126,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { * @throws Exception If test failed. */ public void testLock() throws Throwable { - final IgniteCache cache = ignite.cache(null); + final IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); final CountDownLatch latch1 = new CountDownLatch(1); final CountDownLatch latch2 = new CountDownLatch(1); @@ -244,7 +244,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { * @throws Exception If test failed. */ public void testLockAndPut() throws Throwable { - final IgniteCache cache = ignite.cache(null); + final IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); final CountDownLatch latch1 = new CountDownLatch(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java index 3551bb4..f6dc535 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java @@ -56,7 +56,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest @Override protected void beforeTest() throws Exception { Ignite ignite = grid(); - cache = ignite.cache(null); + cache = ignite.cache(DEFAULT_CACHE_NAME); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index e27207d..160e251 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -141,7 +141,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { Transaction tx = null; try { - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); tx = ignite.transactions().txStart(concurrency, isolation, 50, 0); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/BinaryTxCacheLocalEntriesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/BinaryTxCacheLocalEntriesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/BinaryTxCacheLocalEntriesSelfTest.java index 74d415f7..e89c73d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/BinaryTxCacheLocalEntriesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/BinaryTxCacheLocalEntriesSelfTest.java @@ -59,7 +59,7 @@ public class BinaryTxCacheLocalEntriesSelfTest extends GridCacheAbstractSelfTest * @throws Exception If failed. */ public void testLocalEntries() throws Exception { - IgniteCache cache = grid(0).cache(null).withKeepBinary(); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME).withKeepBinary(); final int ENTRY_CNT = 10; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java index 612043f..d8f1c1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java @@ -252,7 +252,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen int backups, CacheAtomicityMode atomicityMode, boolean filter) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java index 1345dfe..8c76bbd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java @@ -768,7 +768,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr CacheMode cacheMode, int backups, CacheAtomicityMode atomicityMode) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setName("test-cache-" + atomicityMode + "-" + cacheMode + "-" + backups); ccfg.setAtomicityMode(atomicityMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java index c713bb5..a0969d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java @@ -82,7 +82,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest extends GridCommonAbstract protected CacheConfiguration cacheConfiguration( CacheAtomicityMode cacheAtomicityMode, CacheMode cacheMode) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(cacheAtomicityMode); ccfg.setCacheMode(cacheMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java index 6b1a498..befd1d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java @@ -85,6 +85,7 @@ import org.apache.ignite.internal.util.typedef.PA; import org.apache.ignite.internal.util.typedef.PAX; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.T3; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteAsyncCallback; import org.apache.ignite.lang.IgniteInClosure; @@ -149,7 +150,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC cfg.setEventStorageSpi(evtSpi); - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setCacheMode(cacheMode()); ccfg.setAtomicityMode(atomicityMode()); @@ -223,7 +224,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC client = false; - IgniteCache qryClnCache = qryClient.cache(null); + IgniteCache qryClnCache = qryClient.cache(DEFAULT_CACHE_NAME); final CacheEventListener3 lsnr = new CacheEventListener3(); @@ -234,7 +235,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC qry.setRemoteFilter(new CacheEventFilter()); try (QueryCursor cur = qryClnCache.query(qry)) { - List keys = testKeys(grid(0).cache(null), 1); + List keys = testKeys(grid(0).cache(DEFAULT_CACHE_NAME), 1); for (Integer key : keys) qryClnCache.put(key, -1); @@ -259,13 +260,13 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC int minorVer = ignite0.configuration().isLateAffinityAssignment() ? 1 : 0; - GridDhtPartitionTopology top0 = ((IgniteKernal)ignite0).context().cache().context().cacheContext(1).topology(); + GridDhtPartitionTopology top0 = ((IgniteKernal)ignite0).context().cache().context().cacheContext(CU.cacheId(DEFAULT_CACHE_NAME)).topology(); assertTrue(top0.rebalanceFinished(new AffinityTopologyVersion(1))); assertFalse(top0.rebalanceFinished(new AffinityTopologyVersion(2))); Ignite ignite1 = startGrid(1); - GridDhtPartitionTopology top1 = ((IgniteKernal)ignite1).context().cache().context().cacheContext(1).topology(); + GridDhtPartitionTopology top1 = ((IgniteKernal)ignite1).context().cache().context().cacheContext(CU.cacheId(DEFAULT_CACHE_NAME)).topology(); waitRebalanceFinished(ignite0, 2, minorVer); waitRebalanceFinished(ignite1, 2, minorVer); @@ -274,7 +275,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC assertFalse(top1.rebalanceFinished(new AffinityTopologyVersion(3))); Ignite ignite2 = startGrid(2); - GridDhtPartitionTopology top2 = ((IgniteKernal)ignite2).context().cache().context().cacheContext(1).topology(); + GridDhtPartitionTopology top2 = ((IgniteKernal)ignite2).context().cache().context().cacheContext(CU.cacheId(DEFAULT_CACHE_NAME)).topology(); waitRebalanceFinished(ignite0, 3, minorVer); waitRebalanceFinished(ignite1, 3, minorVer); @@ -287,7 +288,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC client = true; Ignite ignite3 = startGrid(3); - GridDhtPartitionTopology top3 = ((IgniteKernal)ignite3).context().cache().context().cacheContext(1).topology(); + GridDhtPartitionTopology top3 = ((IgniteKernal)ignite3).context().cache().context().cacheContext(CU.cacheId(DEFAULT_CACHE_NAME)).topology(); assertTrue(top0.rebalanceFinished(new AffinityTopologyVersion(4))); assertTrue(top1.rebalanceFinished(new AffinityTopologyVersion(4))); @@ -406,7 +407,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC final AffinityTopologyVersion topVer0 = new AffinityTopologyVersion(topVer, minorVer); final GridDhtPartitionTopology top = - ((IgniteKernal)ignite).context().cache().context().cacheContext(1).topology(); + ((IgniteKernal)ignite).context().cache().context().cacheContext(CU.cacheId(DEFAULT_CACHE_NAME)).topology(); GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { @@ -454,19 +455,19 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC int killedNode = rnd.nextInt(SRV_NODES); for (int i = 0; i < 10; i++) { - List keys = testKeys(grid(0).cache(null), 10); + List keys = testKeys(grid(0).cache(DEFAULT_CACHE_NAME), 10); for (Integer key : keys) { IgniteCache cache = null; if (rnd.nextBoolean()) - cache = qryClient.cache(null); + cache = qryClient.cache(DEFAULT_CACHE_NAME); else { for (int j = 0; j < 1000; j++) { int nodeIdx = rnd.nextInt(SRV_NODES); if (killedNode != nodeIdx) { - cache = grid(nodeIdx).cache(null); + cache = grid(nodeIdx).cache(DEFAULT_CACHE_NAME); break; } @@ -478,7 +479,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC cache.put(key, key); - int part = qryClient.affinity(null).partition(key); + int part = qryClient.affinity(DEFAULT_CACHE_NAME).partition(key); Long cntr = updateCntrs.get(part); @@ -517,9 +518,9 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC if (i == killedNodeIdx) continue; - Affinity aff = grid(i).affinity(null); + Affinity aff = grid(i).affinity(DEFAULT_CACHE_NAME); - Map> act = grid(i).cachex(null).context().topology().updateCounters(false); + Map> act = grid(i).cachex(DEFAULT_CACHE_NAME).context().topology().updateCounters(false); for (Map.Entry e : updCntrs.entrySet()) { if (aff.mapPartitionToPrimaryAndBackups(e.getKey()).contains(grid(i).localNode())) @@ -546,7 +547,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC client = false; - IgniteCache clnCache = qryClient.cache(null); + IgniteCache clnCache = qryClient.cache(DEFAULT_CACHE_NAME); IgniteOutClosure> rndCache = new IgniteOutClosure>() { @@ -555,13 +556,13 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC @Override public IgniteCache apply() { ++cnt; - return grid(cnt % SRV_NODES + 1).cache(null); + return grid(cnt % SRV_NODES + 1).cache(DEFAULT_CACHE_NAME); } }; Ignite igniteSrv = ignite(0); - IgniteCache srvCache = igniteSrv.cache(null); + IgniteCache srvCache = igniteSrv.cache(DEFAULT_CACHE_NAME); List keys = testKeys(srvCache, 3); @@ -661,13 +662,13 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC qry.setRemoteFilter(lsnr); - IgniteCache clnCache = qryClient.cache(null); + IgniteCache clnCache = qryClient.cache(DEFAULT_CACHE_NAME); QueryCursor> qryCur = clnCache.query(qry); Ignite igniteSrv = ignite(0); - IgniteCache srvCache = igniteSrv.cache(null); + IgniteCache srvCache = igniteSrv.cache(DEFAULT_CACHE_NAME); Affinity aff = affinity(srvCache); @@ -807,12 +808,12 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC client = false; - IgniteCache qryClientCache = qryClient.cache(null); + IgniteCache qryClientCache = qryClient.cache(DEFAULT_CACHE_NAME); if (cacheMode() != REPLICATED) assertEquals(backups, qryClientCache.getConfiguration(CacheConfiguration.class).getBackups()); - Affinity aff = qryClient.affinity(null); + Affinity aff = qryClient.affinity(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -837,7 +838,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC Ignite ignite = ignite(i); - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); List keys = testKeys(cache, PARTS); @@ -932,9 +933,9 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC client = false; - IgniteCache qryClientCache = qryClient.cache(null); + IgniteCache qryClientCache = qryClient.cache(DEFAULT_CACHE_NAME); - Affinity aff = qryClient.affinity(null); + Affinity aff = qryClient.affinity(DEFAULT_CACHE_NAME); CacheEventListener1 lsnr = asyncCallback() ? new CacheEventAsyncListener1(false) : new CacheEventListener1(false); @@ -958,7 +959,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC Ignite ignite = ignite(i); - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); List keys = testKeys(cache, PARTS); @@ -1044,7 +1045,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC Ignite ignite = startGrid(i); - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); List keys = testKeys(cache, PARTS); @@ -1344,13 +1345,13 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC qry.setLocalListener(lsnr); - QueryCursor cur = qryClient.cache(null).query(qry); + QueryCursor cur = qryClient.cache(DEFAULT_CACHE_NAME).query(qry); final Collection backupQueue = backupQueue(ignite(1)); assertEquals(0, backupQueue.size()); - IgniteCache cache0 = ignite(0).cache(null); + IgniteCache cache0 = ignite(0).cache(DEFAULT_CACHE_NAME); List keys = primaryKeys(cache0, BACKUP_ACK_THRESHOLD); @@ -1418,7 +1419,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC qry.setLocalListener(lsnr); - QueryCursor cur = qryClient.cache(null).query(qry); + QueryCursor cur = qryClient.cache(DEFAULT_CACHE_NAME).query(qry); final Collection backupQueue = backupQueue(ignite(0)); @@ -1428,9 +1429,9 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl)); - final IgniteCache cache0 = ignite(2).cache(null).withExpiryPolicy(expiry); + final IgniteCache cache0 = ignite(2).cache(DEFAULT_CACHE_NAME).withExpiryPolicy(expiry); - final List keys = primaryKeys(ignite(1).cache(null), BACKUP_ACK_THRESHOLD); + final List keys = primaryKeys(ignite(1).cache(DEFAULT_CACHE_NAME), BACKUP_ACK_THRESHOLD); CountDownLatch latch = new CountDownLatch(keys.size()); @@ -1489,7 +1490,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC qry.setLocalListener(lsnr); - IgniteCache cache = qryClient.cache(null); + IgniteCache cache = qryClient.cache(DEFAULT_CACHE_NAME); QueryCursor cur = cache.query(qry); @@ -1537,7 +1538,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC for (Object info : infos.values()) { GridContinuousHandler hnd = GridTestUtils.getFieldValue(info, "hnd"); - if (hnd.isQuery() && hnd.cacheName() == null) { + if (hnd.isQuery() && DEFAULT_CACHE_NAME.equals(hnd.cacheName())) { backupQueue = GridTestUtils.getFieldValue(hnd, CacheContinuousQueryHandler.class, "backupQueue"); break; @@ -1572,9 +1573,9 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC client = false; - IgniteCache qryClnCache = qryClient.cache(null); + IgniteCache qryClnCache = qryClient.cache(DEFAULT_CACHE_NAME); - Affinity aff = qryClient.affinity(null); + Affinity aff = qryClient.affinity(DEFAULT_CACHE_NAME); final CacheEventListener2 lsnr = new CacheEventListener2(); @@ -1632,7 +1633,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC client = false; - IgniteCache qryClnCache = qryClient.cache(null); + IgniteCache qryClnCache = qryClient.cache(DEFAULT_CACHE_NAME); final CacheEventListener2 lsnr = new CacheEventListener2(); @@ -1704,7 +1705,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC // Start new filter each 5 sec. long startFilterTime = System.currentTimeMillis() + 5_000; - final int PARTS = qryClient.affinity(null).partitions(); + final int PARTS = qryClient.affinity(DEFAULT_CACHE_NAME).partitions(); ThreadLocalRandom rnd = ThreadLocalRandom.current(); @@ -1842,7 +1843,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC List> afterRestEvts = new ArrayList<>(); - for (int i = 0; i < qryClient.affinity(null).partitions(); i++) { + for (int i = 0; i < qryClient.affinity(DEFAULT_CACHE_NAME).partitions(); i++) { Integer oldVal = (Integer)qryClnCache.get(i); qryClnCache.put(i, i); @@ -1879,7 +1880,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC client = false; - final IgniteCache qryClnCache = qryCln.cache(null); + final IgniteCache qryClnCache = qryCln.cache(DEFAULT_CACHE_NAME); final CacheEventListener2 lsnr = asyncCallback() ? new CacheEventAsyncListener2() : new CacheEventListener2(); @@ -2071,7 +2072,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC Ignite qryClient = startGrid(SRV_NODES); - final IgniteCache cache = qryClient.cache(null); + final IgniteCache cache = qryClient.cache(DEFAULT_CACHE_NAME); CacheEventListener1 lsnr = new CacheEventListener1(true); @@ -2085,7 +2086,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC final int SRV_IDX = SRV_NODES - 1; - List keys = primaryKeys(ignite(SRV_IDX).cache(null), 10); + List keys = primaryKeys(ignite(SRV_IDX).cache(DEFAULT_CACHE_NAME), 10); final int THREADS = 10; @@ -2256,7 +2257,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC qry.setLocalListener(lsnr); - IgniteCache cache = qryClient.cache(null); + IgniteCache cache = qryClient.cache(DEFAULT_CACHE_NAME); QueryCursor cur = cache.query(qry); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java index beb8882..a880353 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java @@ -519,7 +519,7 @@ public class CacheContinuousQueryOperationFromCallbackTest extends GridCommonAbs int backups, CacheAtomicityMode atomicityMode, CacheWriteSynchronizationMode writeMode) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setName("test-cache-" + atomicityMode + "-" + cacheMode + "-" + writeMode + "-" + backups); ccfg.setAtomicityMode(atomicityMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java index 0d88ef1..f099951 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java @@ -274,7 +274,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest CacheMode cacheMode, int backups, CacheAtomicityMode atomicityMode) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java index dba995e..70d834e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java @@ -515,7 +515,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes int backups, CacheAtomicityMode atomicityMode, CacheWriteSynchronizationMode writeMode) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setName("test-cache-" + atomicityMode + "-" + cacheMode + "-" + backups + "-" + UUID.randomUUID()); // TODO GG-11220 (remove setName when fixed). http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java index 66454fa..142ff35 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java @@ -1397,7 +1397,7 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract int backups, CacheAtomicityMode atomicityMode, boolean store) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setName("cache-" + UUID.randomUUID()); // TODO GG-11220 (remove setName when fixed). ccfg.setAtomicityMode(atomicityMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java index 95cd3fd..b095b2d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java @@ -278,7 +278,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { CacheMode cacheMode, int backups, CacheAtomicityMode atomicityMode) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java index 12821f3..c8b3bb6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java @@ -96,7 +96,7 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { client.events().localListen(new ReconnectListener(), EventType.EVT_CLIENT_NODE_RECONNECTED); - IgniteCache cache = client.cache(null); + IgniteCache cache = client.cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery(); @@ -179,7 +179,7 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { private void putSomeKeys(int cnt) { IgniteEx ignite = grid(0); - IgniteCache srvCache = ignite.cache(null); + IgniteCache srvCache = ignite.cache(DEFAULT_CACHE_NAME); for (int i = 0; i < cnt; i++) srvCache.put(0, i); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java index 2c226b3..92c1760 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java @@ -78,7 +78,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC cfg.setClientMode(clientMode); - CacheConfiguration cacheCfg = new CacheConfiguration(); + CacheConfiguration cacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME); cacheCfg.setName("simple"); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/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 abd7036..a1467bf 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 @@ -179,7 +179,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo for (int i = 0; i < gridCount(); i++) { for (int j = 0; j < 5; j++) { try { - IgniteCache cache = grid(i).cache(null); + IgniteCache cache = grid(i).cache(DEFAULT_CACHE_NAME); for (Cache.Entry entry : cache.localEntries(new CachePeekMode[] {CachePeekMode.ALL})) cache.remove(entry.getKey()); @@ -198,6 +198,20 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } } + // Wait for all routines are unregistered + GridTestUtils.waitForCondition(new PA() { + @Override public boolean apply() { + for (int i = 0; i < gridCount(); i++) { + GridContinuousProcessor proc = grid(i).context().continuous(); + + if(((Map)U.field(proc, "rmtInfos")).size() > 0) + return false; + } + + return true; + } + }, 3000); + for (int i = 0; i < gridCount(); i++) { GridContinuousProcessor proc = grid(i).context().continuous(); @@ -207,7 +221,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "stopFuts")).size()); assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "bufCheckThreads")).size()); - CacheContinuousQueryManager mgr = grid(i).context().cache().internalCache().context().continuousQueries(); + CacheContinuousQueryManager mgr = grid(i).context().cache().internalCache(DEFAULT_CACHE_NAME).context().continuousQueries(); assertEquals(0, ((Map)U.field(mgr, "lsnrs")).size()); } @@ -277,7 +291,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testAllEntries() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -343,7 +357,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testFilterException() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -372,8 +386,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo if (cacheMode() == LOCAL) return; - IgniteCache cache = grid(0).cache(null); - IgniteCache cache1 = grid(1).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); + IgniteCache cache1 = grid(1).cache(DEFAULT_CACHE_NAME); final AtomicInteger cntr = new AtomicInteger(0); final AtomicInteger cntr1 = new AtomicInteger(0); @@ -398,7 +412,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo try (QueryCursor> qryCur2 = cache1.query(qry2); QueryCursor> qryCur1 = cache.query(qry1)) { for (int i = 0; i < gridCount(); i++) { - IgniteCache cache0 = grid(i).cache(null); + IgniteCache cache0 = grid(i).cache(DEFAULT_CACHE_NAME); cache0.put(1, 1); cache0.put(2, 2); @@ -427,9 +441,9 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo if (cacheMode() == LOCAL) return; - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); - final int parts = grid(0).affinity(null).partitions(); + final int parts = grid(0).affinity(DEFAULT_CACHE_NAME).partitions(); final int keyCnt = parts * 2; @@ -477,7 +491,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testEntriesByFilter() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -546,9 +560,9 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testLocalNodeOnly() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); - if (grid(0).cache(null).getConfiguration(CacheConfiguration.class).getCacheMode() != PARTITIONED) + if (grid(0).cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class).getCacheMode() != PARTITIONED) return; ContinuousQuery qry = new ContinuousQuery<>(); @@ -583,7 +597,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo int key = 0; while (true) { - ClusterNode n = grid(0).affinity(null).mapKeyToNode(key); + ClusterNode n = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToNode(key); assert n != null; @@ -617,10 +631,10 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testBuffering() throws Exception { - if (grid(0).cache(null).getConfiguration(CacheConfiguration.class).getCacheMode() != PARTITIONED) + if (grid(0).cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class).getCacheMode() != PARTITIONED) return; - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -657,7 +671,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo int key = 0; while (true) { - ClusterNode n = grid(0).affinity(null).mapKeyToNode(key); + ClusterNode n = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToNode(key); assert n != null; @@ -702,7 +716,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testTimeInterval() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() != PARTITIONED) return; @@ -743,7 +757,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo int key = 0; while (true) { - ClusterNode n = grid(0).affinity(null).mapKeyToNode(key); + ClusterNode n = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToNode(key); assert n != null; @@ -782,7 +796,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testInitialQuery() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -827,7 +841,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testInitialQueryAndUpdates() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -889,7 +903,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testLoadCache() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -925,7 +939,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo if (atomicityMode() == ATOMIC) return; - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -962,7 +976,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo */ @SuppressWarnings("TryFinallyCanBeTryWithResources") public void testNodeJoinWithoutCache() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -1005,7 +1019,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo CacheQueryReadEvent qe = (CacheQueryReadEvent)evt; assertEquals(CONTINUOUS.name(), qe.queryType()); - assertNull(qe.cacheName()); + assertEquals(DEFAULT_CACHE_NAME, qe.cacheName()); assertEquals(grid(0).localNode().id(), qe.subjectId()); @@ -1029,7 +1043,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt; assertEquals(CONTINUOUS.name(), qe.queryType()); - assertNull(qe.cacheName()); + assertEquals(DEFAULT_CACHE_NAME, qe.cacheName()); assertEquals(grid(0).localNode().id(), qe.subjectId()); @@ -1051,7 +1065,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo grid(i).events().localListen(execLsnr, EVT_CACHE_QUERY_EXECUTED); } - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -1089,7 +1103,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testExpired() throws Exception { - IgniteCache cache = grid(0).cache(null). + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME). withExpiryPolicy(new CreatedExpiryPolicy(new Duration(MILLISECONDS, 1000))); final Map map = new ConcurrentHashMap8<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java index 5a066fa..e444a72 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java @@ -88,7 +88,7 @@ public class GridCacheContinuousQueryNodesFilteringTest extends GridCommonAbstra private Ignite startNodeWithCache() throws Exception { Ignite node1 = startGrid("node1", getConfiguration("node1", true, null)); - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setName("attrsTestCache"); ccfg.setNodeFilter(new IgnitePredicate() { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java index 73acbe5..863bc80 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java @@ -49,8 +49,8 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu * @throws Exception If failed. */ public void testRemoteNodeCallback() throws Exception { - IgniteCache cache1 = grid(0).cache(null); - IgniteCache cache2 = grid(1).cache(null); + IgniteCache cache1 = grid(0).cache(DEFAULT_CACHE_NAME); + IgniteCache cache2 = grid(1).cache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -89,8 +89,8 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu */ public void testCrossCallback() throws Exception { // Prepare. - IgniteCache cache1 = grid(0).cache(null); - IgniteCache cache2 = grid(1).cache(null); + IgniteCache cache1 = grid(0).cache(DEFAULT_CACHE_NAME); + IgniteCache cache2 = grid(1).cache(DEFAULT_CACHE_NAME); final int key1 = primaryKey(cache1); final int key2 = primaryKey(cache2);