You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/04/28 06:57:37 UTC
[16/59] [abbrv] ignite git commit: IGNITE-3488: Prohibited null as
cache name. This closes #1790.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
index bb09f40..8da7355 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
@@ -88,7 +88,7 @@ public class GridCacheTxLoadFromStoreOnLockSelfTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
private void checkLoadedValue(int backups) throws Exception {
- CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cacheCfg.setCacheMode(CacheMode.PARTITIONED);
cacheCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index 655d6c0..1d70246 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -180,7 +180,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
int iterations = 10000000;
for (int i = 0; i < iterations; i++)
- aff.mapKeyToNode(null, keys);
+ aff.mapKeyToNode(DEFAULT_CACHE_NAME, keys);
long diff = System.currentTimeMillis() - start;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
index 991735b..5bd53bb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
@@ -66,7 +66,7 @@ public class CacheAtomicSingleMessageCountSelfTest extends GridCommonAbstractTes
cfg.setDiscoverySpi(discoSpi);
- CacheConfiguration cCfg = new CacheConfiguration();
+ CacheConfiguration cCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cCfg.setCacheMode(PARTITIONED);
cCfg.setBackups(1);
@@ -120,7 +120,7 @@ public class CacheAtomicSingleMessageCountSelfTest extends GridCommonAbstractTes
public void testSingleTransformMessage() throws Exception {
startGrids(2);
- int cacheId = ((IgniteKernal)grid(0)).internalCache(null).context().cacheId();
+ int cacheId = ((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME).context().cacheId();
try {
awaitPartitionMapExchange();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java
index 35442bb..3a418f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheClientStoreSelfTest.java
@@ -77,7 +77,7 @@ public class CacheClientStoreSelfTest extends GridCommonAbstractTest {
if (client)
cfg.setMemoryConfiguration(new MemoryConfiguration());
- CacheConfiguration cc = new CacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration(DEFAULT_CACHE_NAME);
cc.setName(CACHE_NAME);
cc.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConcurrentReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConcurrentReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConcurrentReadThroughTest.java
index 0551ec6..130280d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConcurrentReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConcurrentReadThroughTest.java
@@ -87,7 +87,7 @@ public class CacheConcurrentReadThroughTest extends GridCommonAbstractTest {
assertTrue(client.configuration().isClientMode());
for (int iter = 0; iter < 10; iter++) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
final String cacheName = "test-" + iter;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
index df9fbd5..b97bb26 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
@@ -67,7 +67,7 @@ public class CacheConfigurationLeakTest extends GridCommonAbstractTest {
GridTestUtils.runMultiThreaded(new IgniteInClosure<Integer>() {
@Override public void apply(Integer idx) {
for (int i = 0; i < 100; i++) {
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setName("cache-" + idx + "-" + i);
ccfg.setEvictionPolicy(new LruEvictionPolicy(1000));
ccfg.setOnheapCacheEnabled(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
index 37d3f4d..65037d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
@@ -86,7 +86,7 @@ public class CacheDeferredDeleteQueueTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void testQueue(CacheAtomicityMode atomicityMode, boolean nearCache) throws Exception {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(atomicityMode);
@@ -111,7 +111,7 @@ public class CacheDeferredDeleteQueueTest extends GridCommonAbstractTest {
@Override public boolean apply() {
for (int i = 0; i < NODES; i++) {
final GridDhtPartitionTopology top =
- ((IgniteKernal)ignite(i)).context().cache().cache(null).context().topology();
+ ((IgniteKernal)ignite(i)).context().cache().cache(DEFAULT_CACHE_NAME).context().topology();
for (GridDhtLocalPartition p : top.currentLocalPartitions()) {
Collection<Object> rmvQueue = GridTestUtils.getFieldValue(p, "rmvQueue");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
index 5040172..177c990 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
@@ -76,7 +76,7 @@ public class CacheDeferredDeleteSanitySelfTest extends GridCommonAbstractTest {
*/
@SuppressWarnings("unchecked")
private void testDeferredDelete(CacheMode mode, CacheAtomicityMode atomicityMode, boolean near, boolean expVal) {
- CacheConfiguration ccfg = new CacheConfiguration()
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME)
.setCacheMode(mode)
.setAtomicityMode(atomicityMode);
@@ -88,7 +88,7 @@ public class CacheDeferredDeleteSanitySelfTest extends GridCommonAbstractTest {
try {
cache = grid(0).getOrCreateCache(ccfg);
- assertEquals(expVal, ((IgniteCacheProxy)grid(0).cache(null)).context().deferredDelete());
+ assertEquals(expVal, ((IgniteCacheProxy)grid(0).cache(DEFAULT_CACHE_NAME)).context().deferredDelete());
}
finally {
if (cache != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
index 1da94d4..c060eb3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
@@ -36,7 +36,7 @@ public class CacheDhtLocalPartitionAfterRemoveSelfTest extends GridCommonAbstrac
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setNearConfiguration(null);
@@ -62,7 +62,7 @@ public class CacheDhtLocalPartitionAfterRemoveSelfTest extends GridCommonAbstrac
public void testMemoryUsage() throws Exception {
assertEquals(10_000, GridDhtLocalPartition.MAX_DELETE_QUEUE_SIZE);
- IgniteCache<TestKey, Integer> cache = grid(0).cache(null);
+ IgniteCache<TestKey, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 20_000; ++i)
cache.put(new TestKey(String.valueOf(i)), i);
@@ -73,7 +73,7 @@ public class CacheDhtLocalPartitionAfterRemoveSelfTest extends GridCommonAbstrac
assertEquals(0, cache.size());
for (int g = 0; g < GRID_CNT; g++) {
- cache = grid(g).cache(null);
+ cache = grid(g).cache(DEFAULT_CACHE_NAME);
for (GridDhtLocalPartition p : dht(cache).topology().localPartitions()) {
int size = p.dataStore().size();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
index efaaee8..9b4aa46 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
@@ -234,7 +234,7 @@ public abstract class CacheEnumOperationsAbstractTest extends GridCommonAbstract
CacheMode cacheMode,
int backups,
CacheAtomicityMode atomicityMode) {
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> 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/CacheExchangeMessageDuplicatedStateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
index a4dd3fe..d8a2065 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -92,19 +92,19 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
List<CacheConfiguration> ccfgs = new ArrayList<>();
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(AFF1_CACHE1);
ccfg.setAffinity(new RendezvousAffinityFunction(false, 512));
ccfgs.add(ccfg);
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(AFF1_CACHE2);
ccfg.setAffinity(new RendezvousAffinityFunction(false, 512));
ccfgs.add(ccfg);
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(AFF3_CACHE1);
ccfg.setBackups(3);
@@ -114,14 +114,14 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
ccfgs.add(ccfg);
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(AFF4_FILTER_CACHE1);
ccfg.setNodeFilter(new TestNodeFilter());
ccfg.setAffinity(new RendezvousAffinityFunction());
ccfgs.add(ccfg);
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(AFF4_FILTER_CACHE2);
ccfg.setNodeFilter(new TestNodeFilter());
ccfg.setAffinity(new RendezvousAffinityFunction());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
index 1b93623..a51765c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheFutureExceptionSelfTest.java
@@ -101,7 +101,7 @@ public class CacheFutureExceptionSelfTest extends GridCommonAbstractTest {
final String cacheName = nearCache ? ("NEAR-CACHE-" + cpyOnRead) : ("CACHE-" + cpyOnRead);
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setCopyOnRead(cpyOnRead);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
index 0ddac75..dd9ed3c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
@@ -99,7 +99,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
* @throws Exception If failed.
*/
public void testNear() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setCacheMode(PARTITIONED);
@@ -114,7 +114,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
* @throws Exception If failed.
*/
public void testNearTransactional() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setCacheMode(PARTITIONED);
@@ -129,7 +129,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
* @throws Exception If failed.
*/
public void testPartitioned() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setCacheMode(PARTITIONED);
@@ -143,7 +143,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
* @throws Exception If failed.
*/
public void testPartitionedTransactional() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setCacheMode(PARTITIONED);
@@ -157,7 +157,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
* @throws Exception If failed.
*/
public void testLocal() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setCacheMode(LOCAL);
@@ -173,7 +173,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
public void testLocalTransactional() throws Exception {
// TODO: fails since d13520e9a05bd9e9b987529472d6317951b72f96, need to review changes.
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setCacheMode(LOCAL);
@@ -187,7 +187,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
* @throws Exception If failed.
*/
public void testReplicated() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setCacheMode(REPLICATED);
@@ -201,7 +201,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
* @throws Exception If failed.
*/
public void testReplicatedTransactional() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
index 7a7aabe..a48f342 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
@@ -99,7 +99,7 @@ public class CacheGetFromJobTest extends GridCacheAbstractSelfTest {
/** {@inheritDoc} */
@Override public Object call() throws Exception {
- IgniteCache cache = ignite.cache(null);
+ IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME);
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
index 5fe7d70..2874111 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
@@ -480,7 +480,7 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
protected CacheConfiguration<Object, Object> cacheConfiguration(
CacheAtomicityMode atomicityMode,
boolean store) {
- CacheConfiguration<TestKey, TestValue> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<TestKey, TestValue> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(atomicityMode);
ccfg.setCacheMode(LOCAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
index 7d49c11..e23c783 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
@@ -723,7 +723,7 @@ public class CacheInterceptorPartitionCounterRandomOperationsTest extends GridCo
int backups,
CacheAtomicityMode atomicityMode,
boolean store) {
- CacheConfiguration<TestKey, TestValue> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<TestKey, TestValue> 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/CacheMemoryPolicyConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java
index d88723c..92e7e84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java
@@ -58,7 +58,7 @@ public class CacheMemoryPolicyConfigurationTest extends GridCommonAbstractTest {
* Verifies that proper exception is thrown when MemoryPolicy is misconfigured for cache.
*/
public void testMissingMemoryPolicy() throws Exception {
- ccfg = new CacheConfiguration();
+ ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setMemoryPolicyName("nonExistingMemPlc");
@@ -93,11 +93,11 @@ public class CacheMemoryPolicyConfigurationTest extends GridCommonAbstractTest {
memCfg.setMemoryPolicies(dfltPlcCfg, bigPlcCfg);
memCfg.setDefaultMemoryPolicyName("dfltPlc");
- ccfg = new CacheConfiguration();
+ ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
IgniteEx ignite0 = startGrid(0);
- IgniteCache<Object, Object> cache = ignite0.cache(null);
+ IgniteCache<Object, Object> cache = ignite0.cache(DEFAULT_CACHE_NAME);
boolean oomeThrown = false;
@@ -146,12 +146,12 @@ public class CacheMemoryPolicyConfigurationTest extends GridCommonAbstractTest {
memCfg.setMemoryPolicies(dfltPlcCfg, bigPlcCfg);
memCfg.setDefaultMemoryPolicyName("dfltPlc");
- ccfg = new CacheConfiguration();
+ ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setMemoryPolicyName("bigPlc");
IgniteEx ignite0 = startGrid(0);
- IgniteCache<Object, Object> cache = ignite0.cache(null);
+ IgniteCache<Object, Object> cache = ignite0.cache(DEFAULT_CACHE_NAME);
try {
for (int i = 0; i < 500_000; i++)
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesSelfTest.java
index 07ae278..d7d06a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesSelfTest.java
@@ -35,15 +35,15 @@ public class CacheNamesSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration cacheCfg1 = new CacheConfiguration();
+ CacheConfiguration cacheCfg1 = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg1.setCacheMode(CacheMode.REPLICATED);
cacheCfg1.setName("replicated");
- CacheConfiguration cacheCfg2 = new CacheConfiguration();
+ CacheConfiguration cacheCfg2 = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg2.setCacheMode(CacheMode.PARTITIONED);
cacheCfg2.setName("partitioned");
- CacheConfiguration cacheCfg3 = new CacheConfiguration();
+ CacheConfiguration cacheCfg3 = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg3.setCacheMode(CacheMode.LOCAL);
if (client)
@@ -66,7 +66,7 @@ public class CacheNamesSelfTest extends GridCommonAbstractTest {
assertEquals(3, names.size());
for (String name : names)
- assertTrue(name == null || name.equals("replicated") || name.equals("partitioned"));
+ assertTrue(DEFAULT_CACHE_NAME.equals(name) || name.equals("replicated") || name.equals("partitioned"));
client = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesWithSpecialCharactersTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesWithSpecialCharactersTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesWithSpecialCharactersTest.java
index f39a181..ecb8227 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesWithSpecialCharactersTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNamesWithSpecialCharactersTest.java
@@ -37,11 +37,11 @@ public class CacheNamesWithSpecialCharactersTest extends GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration cacheCfg1 = new CacheConfiguration();
+ CacheConfiguration cacheCfg1 = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg1.setCacheMode(CacheMode.REPLICATED);
cacheCfg1.setName(CACHE_NAME_1);
- CacheConfiguration cacheCfg2 = new CacheConfiguration();
+ CacheConfiguration cacheCfg2 = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg2.setCacheMode(CacheMode.PARTITIONED);
cacheCfg2.setName(CACHE_NAME_2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
index 9bd7a8c..c00fe16 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
@@ -343,7 +343,7 @@ public class CacheNearReaderUpdateTest extends GridCommonAbstractTest {
int backups,
boolean storeEnabled,
boolean nearCache) {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(cacheMode);
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/CacheNearUpdateTopologyChangeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java
index e2ad79f..21b3c72 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearUpdateTopologyChangeAbstractTest.java
@@ -56,11 +56,11 @@ public abstract class CacheNearUpdateTopologyChangeAbstractTest extends IgniteCa
public void testNearUpdateTopologyChange() throws Exception {
awaitPartitionMapExchange();
- final Affinity<Integer> aff = grid(0).affinity(null);
+ final Affinity<Integer> aff = grid(0).affinity(DEFAULT_CACHE_NAME);
final Integer key = 9;
- IgniteCache<Integer, Integer> primaryCache = primaryCache(key, null);
+ IgniteCache<Integer, Integer> primaryCache = primaryCache(key, DEFAULT_CACHE_NAME);
final Ignite primaryIgnite = primaryCache.unwrap(Ignite.class);
@@ -104,7 +104,7 @@ public abstract class CacheNearUpdateTopologyChangeAbstractTest extends IgniteCa
gotNewPrimary = true;
- primary.cache(null).put(key, 2);
+ primary.cache(DEFAULT_CACHE_NAME).put(key, 2);
break;
}
@@ -130,7 +130,7 @@ public abstract class CacheNearUpdateTopologyChangeAbstractTest extends IgniteCa
assertTrue(wait);
- log.info("Primary node: " + primaryNode(key, null).name());
+ log.info("Primary node: " + primaryNode(key, DEFAULT_CACHE_NAME).name());
assertTrue(aff.isPrimary(primaryIgnite.cluster().localNode(), key));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
index 06fafb3..1886c76 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
@@ -125,7 +125,7 @@ public class CacheOffheapMapEntrySelfTest extends GridCacheAbstractSelfTest {
try {
GridCacheAdapter<Integer, String> cache = ((IgniteKernal)grid(0)).internalCache(jcache.getName());
- Integer key = primaryKey(grid(0).cache(null));
+ Integer key = primaryKey(grid(0).cache(DEFAULT_CACHE_NAME));
cache.put(key, "val");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java
index 559cf72..1fdb8a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java
@@ -103,7 +103,7 @@ public class CachePutIfAbsentTest extends GridCommonAbstractTest {
CacheMode cacheMode,
CacheWriteSynchronizationMode syncMode,
int backups) {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(cacheMode);
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/CacheReadThroughRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java
index 776e213..8d7af84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughRestartSelfTest.java
@@ -99,7 +99,7 @@ public class CacheReadThroughRestartSelfTest extends GridCacheAbstractSelfTest {
* @throws Exception If failed.
*/
private void testReadThroughInTx(boolean needVer) throws Exception {
- IgniteCache<String, Integer> cache = grid(1).cache(null);
+ IgniteCache<String, Integer> cache = grid(1).cache(DEFAULT_CACHE_NAME);
for (int k = 0; k < 1000; k++)
cache.put("key" + k, k);
@@ -112,7 +112,7 @@ public class CacheReadThroughRestartSelfTest extends GridCacheAbstractSelfTest {
Ignite ignite = grid(1);
- cache = ignite.cache(null);
+ cache = ignite.cache(DEFAULT_CACHE_NAME);
for (TransactionConcurrency txConcurrency : TransactionConcurrency.values()) {
for (TransactionIsolation txIsolation : TransactionIsolation.values()) {
@@ -154,7 +154,7 @@ public class CacheReadThroughRestartSelfTest extends GridCacheAbstractSelfTest {
* @throws Exception If failed.
*/
private void testReadThrough(boolean needVer) throws Exception {
- IgniteCache<String, Integer> cache = grid(1).cache(null);
+ IgniteCache<String, Integer> cache = grid(1).cache(DEFAULT_CACHE_NAME);
for (int k = 0; k < 1000; k++)
cache.put("key" + k, k);
@@ -165,7 +165,7 @@ public class CacheReadThroughRestartSelfTest extends GridCacheAbstractSelfTest {
Ignite ignite = grid(1);
- cache = ignite.cache(null);
+ cache = ignite.cache(DEFAULT_CACHE_NAME);
for (int k = 0; k < 1000; k++) {
String key = "key" + k;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
index 15dcd0e..f5ae59d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
@@ -35,7 +35,7 @@ public class CacheRebalancingSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- cfg.setCacheConfiguration(new CacheConfiguration());
+ cfg.setCacheConfiguration(new CacheConfiguration(DEFAULT_CACHE_NAME));
return cfg;
}
@@ -55,7 +55,7 @@ public class CacheRebalancingSelfTest extends GridCommonAbstractTest {
startGrid(1);
- IgniteCache<Object, Object> cache = ig0.cache(null);
+ IgniteCache<Object, Object> cache = ig0.cache(DEFAULT_CACHE_NAME);
IgniteFuture fut1 = cache.rebalance();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
index 674467a..a27bdda 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
@@ -43,7 +43,7 @@ public class CacheRemoveAllSelfTest extends GridCacheAbstractSelfTest {
* @throws Exception If failed.
*/
public void testRemoveAll() throws Exception {
- IgniteCache<Integer, String> cache = grid(0).cache(null);
+ IgniteCache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 10_000; ++i)
cache.put(i, "val");
@@ -66,7 +66,7 @@ public class CacheRemoveAllSelfTest extends GridCacheAbstractSelfTest {
U.sleep(5000);
for (int i = 0; i < igniteId.get(); ++i) {
- IgniteCache locCache = grid(i).cache(null);
+ IgniteCache locCache = grid(i).cache(DEFAULT_CACHE_NAME);
assertEquals("Local size: " + locCache.localSize() + "\n" +
"On heap: " + locCache.localSize(CachePeekMode.ONHEAP) + "\n" +
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
index bfd7806..6ee4c99 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
@@ -660,8 +660,8 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
try {
IgniteCache<Integer, Integer> cache = ignite0.createCache(ccfg);
- Integer key0 = primaryKey(ignite(0).cache(null));
- Integer key1 = primaryKey(ignite(1).cache(null));
+ Integer key0 = primaryKey(ignite(0).cache(DEFAULT_CACHE_NAME));
+ Integer key1 = primaryKey(ignite(1).cache(DEFAULT_CACHE_NAME));
try (Transaction tx = txs.txStart(OPTIMISTIC, SERIALIZABLE)) {
cache.put(key0, key0);
@@ -5059,7 +5059,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
int backups,
boolean storeEnabled,
boolean nearCache) {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(cacheMode);
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/CacheStartupInDeploymentModesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java
index d065890..949147e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java
@@ -50,11 +50,11 @@ public class CacheStartupInDeploymentModesTest extends GridCommonAbstractTest {
cfg.setMarshaller(marshaller);
cfg.setDeploymentMode(deploymentMode);
- CacheConfiguration cacheCfg1 = new CacheConfiguration();
+ CacheConfiguration cacheCfg1 = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg1.setCacheMode(CacheMode.REPLICATED);
cacheCfg1.setName(REPLICATED_CACHE);
- CacheConfiguration cacheCfg2 = new CacheConfiguration();
+ CacheConfiguration cacheCfg2 = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg2.setCacheMode(CacheMode.PARTITIONED);
cacheCfg2.setName(PARTITIONED_CACHE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
index 70f2fc5..5af7b07 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
@@ -100,7 +100,7 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs
*/
@SuppressWarnings("unchecked")
protected CacheConfiguration cacheConfiguration() {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(atomicityMode());
@@ -147,9 +147,9 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs
awaitPartitionMapExchange();
- IgniteCache<Object, Object> cache0 = ignite(0).cache(null);
- IgniteCache<Object, Object> cache1 = ignite(1).cache(null);
- IgniteCache<Object, Object> clientCache = client.cache(null);
+ IgniteCache<Object, Object> cache0 = ignite(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> cache1 = ignite(1).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> clientCache = client.cache(DEFAULT_CACHE_NAME);
assertTrue(((IgniteCacheProxy)cache0).context().store().configured());
assertEquals(clientStore, ((IgniteCacheProxy) clientCache).context().store().configured());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
index 44cd37e..9171db8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
@@ -157,12 +157,12 @@ public abstract class CacheStoreUsageMultinodeDynamicStartAbstractTest extends C
try {
if (nearCache)
- client.createNearCache(null, new NearCacheConfiguration<>());
+ client.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<>());
checkStoreUpdate(true);
}
finally {
- cache = srv.cache(null);
+ cache = srv.cache(DEFAULT_CACHE_NAME);
if (cache != null)
cache.destroy();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
index cad65d4..9f4910a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
@@ -63,7 +63,7 @@ public class CacheTxFastFinishTest extends GridCommonAbstractTest {
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(TRANSACTIONAL);
@@ -144,7 +144,7 @@ public class CacheTxFastFinishTest extends GridCommonAbstractTest {
private void fastFinishTx(Ignite ignite) {
IgniteTransactions txs = ignite.transactions();
- IgniteCache cache = ignite.cache(null);
+ IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME);
for (boolean commit : new boolean[]{true, false}) {
for (TransactionConcurrency c : TransactionConcurrency.values()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java
index aad6826..b64cf85 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java
@@ -54,12 +54,12 @@ public class CrossCacheLockTest extends GridCommonAbstractTest {
if (igniteInstanceName.equals(getTestIgniteInstanceName(GRID_CNT - 1)))
cfg.setClientMode(true);
- CacheConfiguration ccfg1 = new CacheConfiguration();
+ CacheConfiguration ccfg1 = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg1.setName(CACHE1);
ccfg1.setBackups(1);
ccfg1.setAtomicityMode(TRANSACTIONAL);
- CacheConfiguration ccfg2 = new CacheConfiguration();
+ CacheConfiguration ccfg2 = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg2.setName(CACHE2);
ccfg2.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
index abd126c..6c22b05 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
@@ -159,7 +159,7 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest {
CacheMode cacheMode,
CacheWriteSynchronizationMode writeSync,
boolean nearCache) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(name);
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/EntryVersionConsistencyReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
index f86da12..a6ab938 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
@@ -70,7 +70,7 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe
*/
@SuppressWarnings({"rawtypes", "unchecked"})
private CacheConfiguration<String, List<Double>> createCacheConfiguration(CacheAtomicityMode atomicityMode) {
- CacheConfiguration<String, List<Double>> cc = new CacheConfiguration<>();
+ CacheConfiguration<String, List<Double>> cc = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cc.setCacheMode(PARTITIONED);
cc.setAtomicityMode(atomicityMode);
@@ -158,7 +158,7 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe
IgniteEx grid = grid(i);
- final IgniteCache<String, Integer> cache = grid.cache(null);
+ final IgniteCache<String, Integer> cache = grid.cache(DEFAULT_CACHE_NAME);
if (single)
for (String key : keys)
@@ -168,7 +168,7 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe
// Check entry versions consistency.
for (String key : keys) {
- Collection<ClusterNode> nodes = grid.affinity(null).mapKeyToPrimaryAndBackups(key);
+ Collection<ClusterNode> nodes = grid.affinity(DEFAULT_CACHE_NAME).mapKeyToPrimaryAndBackups(key);
List<IgniteEx> grids = grids(nodes);
@@ -176,7 +176,7 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe
Object val0 = null;
for (IgniteEx g : grids) {
- GridCacheAdapter<Object, Object> cx = g.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> cx = g.context().cache().internalCache(DEFAULT_CACHE_NAME);
GridCacheEntryEx e = cx.entryEx(key);
@@ -201,7 +201,7 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe
}
}
finally {
- grid(0).destroyCache(null);
+ grid(0).destroyCache(DEFAULT_CACHE_NAME);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index 57a2420..de1848f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -207,7 +207,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
try {
final Ignite g = startGrid(name);
- IgniteCache<String, Object> cache = g.cache(null);
+ IgniteCache<String, Object> cache = g.cache(DEFAULT_CACHE_NAME);
for (int k = half; k < ENTRY_CNT; k++) {
String key = "key" + k;
@@ -384,6 +384,6 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
* @return Cache.
*/
private IgniteCache<String,Integer> cache(Ignite g) {
- return g.cache(null);
+ return g.cache(DEFAULT_CACHE_NAME);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/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 93ed7a1..bf27e26 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
@@ -422,7 +422,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
map.put("key" + i, i);
// Put in primary nodes to avoid near readers which will prevent entry from being cleared.
- Map<ClusterNode, Collection<String>> mapped = grid(0).<String>affinity(null).mapKeysToNodes(map.keySet());
+ Map<ClusterNode, Collection<String>> mapped = grid(0).<String>affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(map.keySet());
for (int i = 0; i < gridCount(); i++) {
Collection<String> keys = mapped.get(grid(i).localNode());
@@ -435,7 +435,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
map.remove("key0");
- mapped = grid(0).<String>affinity(null).mapKeysToNodes(map.keySet());
+ mapped = grid(0).<String>affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(map.keySet());
for (int i = 0; i < gridCount(); i++) {
// Will actually delete entry from map.
@@ -1474,7 +1474,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
assertEquals(exp, cache.get(key));
for (int i = 0; i < gridCount(); i++) {
- if (ignite(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key))
+ if (ignite(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), key))
assertEquals(exp, peek(jcache(i), key));
}
}
@@ -2245,7 +2245,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
for (int i = 0; i < gridCount(); i++) {
info("Peek on node [i=" + i + ", id=" + grid(i).localNode().id() + ", val=" +
- grid(i).cache(null).localPeek("key", ONHEAP) + ']');
+ grid(i).cache(DEFAULT_CACHE_NAME).localPeek("key", ONHEAP) + ']');
}
assertEquals((Integer)1, cache.getAndPutIfAbsent("key", 2));
@@ -2700,10 +2700,10 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
for (int i = 0; i < gridCount(); i++) {
info("Peek key on grid [i=" + i + ", nodeId=" + grid(i).localNode().id() +
- ", peekVal=" + grid(i).cache(null).localPeek("key", ONHEAP) + ']');
+ ", peekVal=" + grid(i).cache(DEFAULT_CACHE_NAME).localPeek("key", ONHEAP) + ']');
info("Peek key2 on grid [i=" + i + ", nodeId=" + grid(i).localNode().id() +
- ", peekVal=" + grid(i).cache(null).localPeek("key2", ONHEAP) + ']');
+ ", peekVal=" + grid(i).cache(DEFAULT_CACHE_NAME).localPeek("key2", ONHEAP) + ']');
}
if (!isMultiJvm())
@@ -3051,7 +3051,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testGetAndRemoveObject() throws Exception {
- IgniteCache<String, TestValue> cache = ignite(0).cache(null);
+ IgniteCache<String, TestValue> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
TestValue val1 = new TestValue(1);
TestValue val2 = new TestValue(2);
@@ -3081,7 +3081,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testGetAndPutObject() throws Exception {
- IgniteCache<String, TestValue> cache = ignite(0).cache(null);
+ IgniteCache<String, TestValue> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
TestValue val1 = new TestValue(1);
TestValue val2 = new TestValue(2);
@@ -3140,13 +3140,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
storeStgy.putToStore(key, Integer.parseInt(key));
for (int g = 0; g < gridCount(); g++)
- grid(g).cache(null).localLoadCache(null);
+ grid(g).cache(DEFAULT_CACHE_NAME).localLoadCache(null);
for (int g = 0; g < gridCount(); g++) {
for (int i = 0; i < cnt; i++) {
String key = String.valueOf(i);
- if (grid(0).affinity(null).mapKeyToPrimaryAndBackups(key).contains(grid(g).localNode()))
+ if (grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToPrimaryAndBackups(key).contains(grid(g).localNode()))
assertEquals((Integer)i, peek(jcache(g), key));
else
assertNull(peek(jcache(g), key));
@@ -3174,13 +3174,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
storeStgy.putToStore(key, Integer.parseInt(key));
for (int g = 0; g < gridCount(); g++)
- grid(g).cache(null).localLoadCacheAsync(null).get();
+ grid(g).cache(DEFAULT_CACHE_NAME).localLoadCacheAsync(null).get();
for (int g = 0; g < gridCount(); g++) {
for (int i = 0; i < cnt; i++) {
String key = String.valueOf(i);
- if (grid(0).affinity(null).mapKeyToPrimaryAndBackups(key).contains(grid(g).localNode()))
+ if (grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToPrimaryAndBackups(key).contains(grid(g).localNode()))
assertEquals((Integer)i, peek(jcache(g), key));
else
assertNull(peek(jcache(g), key));
@@ -3452,7 +3452,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
}
}, NullPointerException.class, null);
- assertEquals(0, grid(0).cache(null).localSize());
+ assertEquals(0, grid(0).cache(DEFAULT_CACHE_NAME).localSize());
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
@@ -3603,7 +3603,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
public void testRemoveAfterClear() throws Exception {
IgniteEx ignite = grid(0);
- boolean affNode = ignite.context().cache().internalCache(null).context().affinityNode();
+ boolean affNode = ignite.context().cache().internalCache(DEFAULT_CACHE_NAME).context().affinityNode();
if (!affNode) {
if (gridCount() < 2)
@@ -3612,14 +3612,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
ignite = grid(1);
}
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
int key = 0;
Collection<Integer> keys = new ArrayList<>();
for (int k = 0; k < 2; k++) {
- while (!ignite.affinity(null).isPrimary(ignite.localNode(), key))
+ while (!ignite.affinity(DEFAULT_CACHE_NAME).isPrimary(ignite.localNode(), key))
key++;
keys.add(key);
@@ -3637,9 +3637,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
for (int g = 0; g < gridCount(); g++) {
Ignite grid0 = grid(g);
- grid0.cache(null).removeAll();
+ grid0.cache(DEFAULT_CACHE_NAME).removeAll();
- assertTrue(grid0.cache(null).localSize() == 0);
+ assertTrue(grid0.cache(DEFAULT_CACHE_NAME).localSize() == 0);
}
}
@@ -3749,7 +3749,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
@Override public boolean apply() {
try {
for (int i = 0; i < gridCount(); i++) {
- GridCacheAdapter<Object, Object> cache = ((IgniteKernal)ignite(i)).internalCache();
+ GridCacheAdapter<Object, Object> cache = ((IgniteKernal)ignite(i)).internalCache(DEFAULT_CACHE_NAME);
for (String key : keys0) {
GridCacheEntryEx entry = cache.peekEx(key);
@@ -3958,7 +3958,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
*/
public void testPeek() throws Exception {
Ignite ignite = primaryIgnite("key");
- IgniteCache<String, Integer> cache = ignite.cache(null);
+ IgniteCache<String, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
assert peek(cache, "key") == null;
@@ -3990,7 +3990,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
private void checkPeekTxRemove(TransactionConcurrency concurrency) throws Exception {
if (txShouldBeUsed()) {
Ignite ignite = primaryIgnite("key");
- IgniteCache<String, Integer> cache = ignite.cache(null);
+ IgniteCache<String, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
cache.put("key", 1);
@@ -4034,9 +4034,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl));
- grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).withExpiryPolicy(expiry).put(key, 1);
- final Affinity<String> aff = ignite(0).affinity(null);
+ final Affinity<String> aff = ignite(0).affinity(DEFAULT_CACHE_NAME);
boolean wait = waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
@@ -4121,7 +4121,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
try (Transaction tx = grid(0).transactions().txStart()) {
final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl));
- grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).withExpiryPolicy(expiry).put(key, 1);
tx.commit();
}
@@ -4229,7 +4229,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
long[] expireTimes = new long[gridCount()];
for (int i = 0; i < gridCount(); i++) {
- if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), key)) {
IgnitePair<Long> curEntryTtl = entryTtl(jcache(i), key);
assertNotNull(curEntryTtl.get1());
@@ -4258,7 +4258,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
}
for (int i = 0; i < gridCount(); i++) {
- if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), key)) {
IgnitePair<Long> curEntryTtl = entryTtl(jcache(i), key);
assertNotNull(curEntryTtl.get1());
@@ -4287,7 +4287,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
}
for (int i = 0; i < gridCount(); i++) {
- if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), key)) {
IgnitePair<Long> curEntryTtl = entryTtl(jcache(i), key);
assertNotNull(curEntryTtl.get1());
@@ -4320,7 +4320,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
log.info("Put 4 done");
for (int i = 0; i < gridCount(); i++) {
- if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), key)) {
IgnitePair<Long> curEntryTtl = entryTtl(jcache(i), key);
assertNotNull(curEntryTtl.get1());
@@ -4436,7 +4436,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
loadAll(cache, ImmutableSet.of(key1, key2), true);
- Affinity<String> aff = ignite(0).affinity(null);
+ Affinity<String> aff = ignite(0).affinity(DEFAULT_CACHE_NAME);
for (int i = 0; i < gridCount(); i++) {
if (aff.isPrimaryOrBackup(grid(i).cluster().localNode(), key1))
@@ -4475,7 +4475,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl));
- grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).withExpiryPolicy(expiry).put(key, 1);
waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
@@ -4724,7 +4724,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @return Ignite instance for primary node.
*/
protected Ignite primaryIgnite(String key) {
- ClusterNode node = grid(0).affinity(null).mapKeyToNode(key);
+ ClusterNode node = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToNode(key);
if (node == null)
throw new IgniteException("Failed to find primary node.");
@@ -4744,7 +4744,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @return Cache.
*/
protected IgniteCache<String, Integer> primaryCache(String key) {
- return primaryIgnite(key).cache(null);
+ return primaryIgnite(key).cache(DEFAULT_CACHE_NAME);
}
/**
@@ -4781,7 +4781,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testIterator() throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
final int KEYS = 1000;
@@ -4790,7 +4790,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
// Try to initialize readers in case when near cache is enabled.
for (int i = 0; i < gridCount(); i++) {
- cache = grid(i).cache(null);
+ cache = grid(i).cache(DEFAULT_CACHE_NAME);
for (int k = 0; k < KEYS; k++)
assertEquals((Object)k, cache.get(k));
@@ -5050,19 +5050,19 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
Ignite g = primaryIgnite(keyToRmv);
- g.<String, Integer>cache(null).localClear(keyToRmv);
+ g.<String, Integer>cache(DEFAULT_CACHE_NAME).localClear(keyToRmv);
checkLocalRemovedKey(keyToRmv);
- g.<String, Integer>cache(null).put(keyToRmv, 1);
+ g.<String, Integer>cache(DEFAULT_CACHE_NAME).put(keyToRmv, 1);
String keyToEvict = "key" + 30;
g = primaryIgnite(keyToEvict);
- g.<String, Integer>cache(null).localEvict(Collections.singleton(keyToEvict));
+ g.<String, Integer>cache(DEFAULT_CACHE_NAME).localEvict(Collections.singleton(keyToEvict));
- g.<String, Integer>cache(null).localClear(keyToEvict);
+ g.<String, Integer>cache(DEFAULT_CACHE_NAME).localClear(keyToEvict);
checkLocalRemovedKey(keyToEvict);
}
@@ -5074,14 +5074,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
for (int i = 0; i < 500; ++i) {
String key = "key" + i;
- boolean found = primaryIgnite(key).cache(null).localPeek(key) != null;
+ boolean found = primaryIgnite(key).cache(DEFAULT_CACHE_NAME).localPeek(key) != null;
if (keyToRmv.equals(key)) {
- Collection<ClusterNode> nodes = grid(0).affinity(null).mapKeyToPrimaryAndBackups(key);
+ Collection<ClusterNode> nodes = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToPrimaryAndBackups(key);
for (int j = 0; j < gridCount(); ++j) {
if (nodes.contains(grid(j).localNode()) && grid(j) != primaryIgnite(key))
- assertTrue("Not found on backup removed key ", grid(j).cache(null).localPeek(key) != null);
+ assertTrue("Not found on backup removed key ", grid(j).cache(DEFAULT_CACHE_NAME).localPeek(key) != null);
}
assertFalse("Found removed key " + key, found);
@@ -5119,14 +5119,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
info("Will clear keys on node: " + g.cluster().localNode().id());
- g.<String, Integer>cache(null).localClearAll(keysToRmv);
+ g.<String, Integer>cache(DEFAULT_CACHE_NAME).localClearAll(keysToRmv);
for (int i = 0; i < 500; ++i) {
String key = "key" + i;
Ignite ignite = primaryIgnite(key);
- boolean found = ignite.cache(null).localPeek(key) != null;
+ boolean found = ignite.cache(DEFAULT_CACHE_NAME).localPeek(key) != null;
if (keysToRmv.contains(key))
assertFalse("Found removed key [key=" + key + ", node=" + ignite.cluster().localNode().id() + ']',
@@ -5154,7 +5154,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
Ignite g = primaryIgnite(key);
- g.cache(null).put(key, "value" + i);
+ g.cache(DEFAULT_CACHE_NAME).put(key, "value" + i);
keys.get(g.name()).add(key);
}
@@ -5218,7 +5218,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
Ignite g = primaryIgnite(key);
- g.cache(null).put(key, "value" + i);
+ g.cache(DEFAULT_CACHE_NAME).put(key, "value" + i);
}
if (async) {
@@ -5267,7 +5267,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testWithSkipStore() throws Exception {
- IgniteCache<String, Integer> cache = grid(0).cache(null);
+ IgniteCache<String, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
IgniteCache<String, Integer> cacheSkipStore = cache.withSkipStore();
@@ -5479,7 +5479,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
if (atomicityMode() == TRANSACTIONAL || (atomicityMode() == ATOMIC && nearEnabled())) // TODO IGNITE-373.
return;
- IgniteCache<String, Integer> cache = grid(0).cache(null);
+ IgniteCache<String, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
IgniteCache<String, Integer> cacheSkipStore = cache.withSkipStore();
@@ -5518,7 +5518,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
*/
public void testWithSkipStoreTx() throws Exception {
if (txShouldBeUsed()) {
- IgniteCache<String, Integer> cache = grid(0).cache(null);
+ IgniteCache<String, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
IgniteCache<String, Integer> cacheSkipStore = cache.withSkipStore();
@@ -5844,7 +5844,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
};
try {
- IgniteCache<String, Integer> cache = grid(0).cache(null);
+ IgniteCache<String, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
List<String> keys = primaryKeysForCache(cache, 2);
@@ -6327,7 +6327,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
/** {@inheritDoc} */
@Override public void run(int idx) throws Exception {
- GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache().context();
+ GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache(DEFAULT_CACHE_NAME).context();
int size = 0;
@@ -6367,7 +6367,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
/** {@inheritDoc} */
@Override public void run(int idx) throws Exception {
- GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache().context();
+ GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache(DEFAULT_CACHE_NAME).context();
int size = 0;
@@ -6461,7 +6461,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param idx Index.
*/
@Override public Void call(int idx) throws Exception {
- GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache().context();
+ GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache(DEFAULT_CACHE_NAME).context();
GridCacheQueryManager queries = ctx.queries();
ConcurrentMap<UUID, Map<Long, GridFutureAdapter<?>>> map = GridTestUtils.getFieldValue(queries,
@@ -6486,7 +6486,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param idx Index.
*/
@Override public Void call(int idx) throws Exception {
- GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache().context();
+ GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache(DEFAULT_CACHE_NAME).context();
GridCacheQueryManager queries = ctx.queries();
ConcurrentMap<UUID, Map<Long, GridFutureAdapter<?>>> map = GridTestUtils.getFieldValue(queries,
@@ -6538,11 +6538,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
for (int i = 0; i < cnt; i++) {
String key = String.valueOf(i);
- GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache().context();
+ GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache(DEFAULT_CACHE_NAME).context();
GridCacheEntryEx entry = ctx.isNear() ? ctx.near().dht().peekEx(key) : ctx.cache().peekEx(key);
- if (ignite.affinity(null).mapKeyToPrimaryAndBackups(key).contains(((IgniteKernal)ignite).localNode())) {
+ if (ignite.affinity(DEFAULT_CACHE_NAME).mapKeyToPrimaryAndBackups(key).contains(((IgniteKernal)ignite).localNode())) {
assertNotNull(entry);
assertTrue(entry.deleted());
}
@@ -6568,7 +6568,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
/** {@inheritDoc} */
@Override public void run(int idx) throws Exception {
- GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache().context();
+ GridCacheContext<String, Integer> ctx = ((IgniteKernal)ignite).<String, Integer>internalCache(DEFAULT_CACHE_NAME).context();
int size = 0;
@@ -6576,7 +6576,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
if (ctx.affinity().keyLocalNode(key, ctx.discovery().topologyVersionEx()))
size++;
- assertEquals("Incorrect key size on cache #" + idx, size, ignite.cache(null).localSize(ALL));
+ assertEquals("Incorrect key size on cache #" + idx, size, ignite.cache(DEFAULT_CACHE_NAME).localSize(ALL));
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 83d2674..7dce36b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -114,7 +114,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration cacheCfg = cache(igniteInstanceName, null, 0);
+ CacheConfiguration cacheCfg = cache(igniteInstanceName, DEFAULT_CACHE_NAME, 0);
cacheCfg.setAffinity(new RendezvousAffinityFunction());
@@ -217,7 +217,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
public void testEvict() throws Exception {
Ignite ignite1 = startGrid(1);
- IgniteCache<Object, Object> cache = ignite1.cache(null).withExpiryPolicy(new CreatedExpiryPolicy(
+ IgniteCache<Object, Object> cache = ignite1.cache(DEFAULT_CACHE_NAME).withExpiryPolicy(new CreatedExpiryPolicy(
new Duration(TimeUnit.MILLISECONDS, 100L)));
// Putting entry.
@@ -245,13 +245,13 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
public void testPrimaryNode() throws Exception {
Ignite ignite1 = startGrid(1);
- IgniteCache<Object, Object> cache = ignite1.cache(null);
+ IgniteCache<Object, Object> cache = ignite1.cache(DEFAULT_CACHE_NAME);
// Populate cache and check that local store has all value.
for (int i = 0; i < KEYS; i++)
cache.put(i, i);
- checkLocalStore(ignite1, LOCAL_STORE_1, null);
+ checkLocalStore(ignite1, LOCAL_STORE_1, DEFAULT_CACHE_NAME);
final AtomicInteger evtCnt = new AtomicInteger(0);
@@ -271,7 +271,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
// Partition count which must be transferred to 2'nd node.
- int parts = ignite2.affinity(null).allPartitions(ignite2.cluster().localNode()).length;
+ int parts = ignite2.affinity(DEFAULT_CACHE_NAME).allPartitions(ignite2.cluster().localNode()).length;
return evtCnt.get() >= parts;
}
@@ -282,8 +282,8 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
assertEquals(Ignition.allGrids().size(), 2);
- checkLocalStore(ignite1, LOCAL_STORE_1, null);
- checkLocalStore(ignite2, LOCAL_STORE_2, null);
+ checkLocalStore(ignite1, LOCAL_STORE_1, DEFAULT_CACHE_NAME);
+ checkLocalStore(ignite2, LOCAL_STORE_2, DEFAULT_CACHE_NAME);
}
@@ -411,7 +411,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
* @throws Exception If failed.
*/
public void testLocalStoreCorrespondsAffinityNoBackups() throws Exception {
- testLocalStoreCorrespondsAffinity(null);
+ testLocalStoreCorrespondsAffinity(DEFAULT_CACHE_NAME);
}
/**
@@ -670,13 +670,13 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
public void testSwap() throws Exception {
Ignite ignite1 = startGrid(1);
- IgniteCache<Object, Object> cache = ignite1.cache(null);
+ IgniteCache<Object, Object> cache = ignite1.cache(DEFAULT_CACHE_NAME);
// Populate cache and check that local store has all value.
for (int i = 0; i < KEYS; i++)
cache.put(i, i);
- checkLocalStore(ignite1, LOCAL_STORE_1, null);
+ checkLocalStore(ignite1, LOCAL_STORE_1, DEFAULT_CACHE_NAME);
// Push entry to swap.
for (int i = 0; i < KEYS; i++)
@@ -703,7 +703,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
// Partition count which must be transferred to 2'nd node.
- int parts = ignite2.affinity(null).allPartitions(ignite2.cluster().localNode()).length;
+ int parts = ignite2.affinity(DEFAULT_CACHE_NAME).allPartitions(ignite2.cluster().localNode()).length;
return evtCnt.get() >= parts;
}
@@ -714,8 +714,8 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
assertEquals(Ignition.allGrids().size(), 2);
- checkLocalStore(ignite1, LOCAL_STORE_1, null);
- checkLocalStore(ignite2, LOCAL_STORE_2, null);
+ checkLocalStore(ignite1, LOCAL_STORE_1, DEFAULT_CACHE_NAME);
+ checkLocalStore(ignite2, LOCAL_STORE_2, DEFAULT_CACHE_NAME);
}
/**