You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/04/28 12:44:40 UTC
[12/64] [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/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
index 0588139..c3e3e88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
@@ -41,7 +41,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -244,7 +244,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
assertEquals(1L, ignite0.localNode().order());
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setNodeFilter(new TestFilterExcludeOldest());
@@ -256,11 +256,11 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
assertTrue(client.configuration().isClientMode());
- assertNotNull(client.getOrCreateCache((String)null));
+ assertNotNull(client.getOrCreateCache(DEFAULT_CACHE_NAME));
awaitPartitionMapExchange();
- checkCache(null);
+ checkCache(DEFAULT_CACHE_NAME);
}
/**
@@ -271,7 +271,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
assertEquals(1L, ignite0.localNode().order());
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setNodeFilter(new TestFilterIncludeNode(3));
@@ -281,11 +281,11 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
IgniteEx ingite1 = grid(1);
- assertNotNull(ingite1.getOrCreateCache((String)null));
+ assertNotNull(ingite1.getOrCreateCache(DEFAULT_CACHE_NAME));
awaitPartitionMapExchange();
- checkCache(null);
+ checkCache(DEFAULT_CACHE_NAME);
}
/**
@@ -296,7 +296,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
assertEquals(1L, ignite0.localNode().order());
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setNodeFilter(new TestFilterIncludeNode(3));
@@ -308,17 +308,17 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
assertTrue(client.configuration().isClientMode());
- assertNotNull(client.getOrCreateCache((String)null));
+ assertNotNull(client.getOrCreateCache(DEFAULT_CACHE_NAME));
awaitPartitionMapExchange();
- checkCache(null);
+ checkCache(DEFAULT_CACHE_NAME);
}
/**
* @param name Cache name.
*/
- private void checkCache(@Nullable String name) {
+ private void checkCache(@NotNull String name) {
int key = 0;
for (Ignite ignite : G.allGrids()) {
@@ -343,7 +343,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
List<CacheConfiguration> res = new ArrayList<>();
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("cache-1");
ccfg.setAtomicityMode(ATOMIC);
@@ -354,7 +354,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("cache-2");
ccfg.setAtomicityMode(ATOMIC);
@@ -365,7 +365,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("cache-3");
ccfg.setAtomicityMode(ATOMIC);
@@ -376,7 +376,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("cache-4");
ccfg.setAtomicityMode(TRANSACTIONAL);
@@ -387,7 +387,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("cache-5");
ccfg.setAtomicityMode(TRANSACTIONAL);
@@ -398,7 +398,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
}
{
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("cache-4");
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/IgniteDynamicCacheStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
index 82674c6..4a34a1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
@@ -114,7 +114,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
cfg.setUserAttributes(F.asMap(TEST_ATTRIBUTE_NAME, testAttribute));
- CacheConfiguration cacheCfg = new CacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg.setCacheMode(CacheMode.REPLICATED);
@@ -156,7 +156,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
GridTestUtils.runMultiThreaded(new Callable<Object>() {
@Override public Object call() throws Exception {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(DYNAMIC_CACHE_NAME);
@@ -220,7 +220,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
GridTestUtils.runMultiThreaded(new Callable<Object>() {
@Override public Object call() throws Exception {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(DYNAMIC_CACHE_NAME);
@@ -313,7 +313,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
private void checkStartStopCacheSimple(CacheAtomicityMode mode) throws Exception {
final IgniteEx kernal = grid(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
ccfg.setAtomicityMode(mode);
@@ -374,7 +374,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
List<CacheConfiguration> ccfgList = new ArrayList<>();
for (int i = 0; i < cacheCnt; i++) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
ccfg.setAtomicityMode(mode);
ccfg.setName(DYNAMIC_CACHE_NAME + Integer.toString(i));
@@ -450,7 +450,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
public void testStartStopCacheAddNode() throws Exception {
final IgniteEx kernal = grid(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(CacheMode.REPLICATED);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -508,7 +508,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
final IgniteEx kernal = grid(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
ccfg.setName(DYNAMIC_CACHE_NAME);
@@ -572,7 +572,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
@Override public Object call() throws Exception {
final Ignite kernal = grid(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
// Cache is already configured, should fail.
@@ -593,14 +593,14 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
@Override public Object call() throws Exception {
final Ignite kernal = grid(0);
- CacheConfiguration ccfgDynamic = new CacheConfiguration();
+ CacheConfiguration ccfgDynamic = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfgDynamic.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
ccfgDynamic.setName(DYNAMIC_CACHE_NAME);
ccfgDynamic.setNodeFilter(NODE_FILTER);
- CacheConfiguration ccfgStatic = new CacheConfiguration();
+ CacheConfiguration ccfgStatic = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfgStatic.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
// Cache is already configured, should fail.
@@ -626,7 +626,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
final IgniteEx kernal = grid(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
ccfg.setName(DYNAMIC_CACHE_NAME);
@@ -669,7 +669,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
final IgniteEx kernal = grid(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
ccfg.setName(DYNAMIC_CACHE_NAME);
@@ -711,7 +711,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
final IgniteEx kernal = grid(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
ccfg.setName(DYNAMIC_CACHE_NAME);
@@ -749,7 +749,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testEvents() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setName(DYNAMIC_CACHE_NAME);
cfg.setCacheMode(CacheMode.REPLICATED);
@@ -817,7 +817,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
Ignite ig = startGrid(nodeCount());
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(DYNAMIC_CACHE_NAME);
ccfg.setCacheMode(CacheMode.PARTITIONED);
@@ -856,7 +856,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
public void testGetOrCreate() throws Exception {
try {
- final CacheConfiguration cfg = new CacheConfiguration();
+ final CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setName(DYNAMIC_CACHE_NAME);
cfg.setNodeFilter(NODE_FILTER);
@@ -922,7 +922,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
final Collection<CacheConfiguration> ccfgs = new ArrayList<>();
for (int i = 0; i < cacheCnt; i++) {
- final CacheConfiguration cfg = new CacheConfiguration();
+ final CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setName(DYNAMIC_CACHE_NAME + Integer.toString(i));
cfg.setNodeFilter(NODE_FILTER);
@@ -1316,7 +1316,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
Thread.currentThread().setName("start-stop-" + ignite.name());
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("testStartStop");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java
index a841aa0..3adb73f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java
@@ -80,7 +80,7 @@ public class IgniteDynamicCacheStartStopConcurrentTest extends GridCommonAbstrac
@Override public void apply(Integer idx) {
Ignite ignite = ignite(idx);
- ignite.getOrCreateCache(new CacheConfiguration<>());
+ ignite.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
}
}, NODES, "cache-thread");
@@ -88,7 +88,7 @@ public class IgniteDynamicCacheStartStopConcurrentTest extends GridCommonAbstrac
checkTopologyVersion(new AffinityTopologyVersion(NODES, minorVer));
- ignite(0).compute().affinityRun((String)null, 1, new IgniteRunnable() {
+ ignite(0).compute().affinityRun(DEFAULT_CACHE_NAME, 1, new IgniteRunnable() {
@Override public void run() {
// No-op.
}
@@ -98,7 +98,7 @@ public class IgniteDynamicCacheStartStopConcurrentTest extends GridCommonAbstrac
@Override public void apply(Integer idx) {
Ignite ignite = ignite(idx);
- ignite.destroyCache(null);
+ ignite.destroyCache(DEFAULT_CACHE_NAME);
}
}, NODES, "cache-thread");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java
index 284fcef..9176cbd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java
@@ -79,9 +79,9 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
* @throws Exception If failed.
*/
public void testConfiguredCacheOnClientNode() throws Exception {
- ccfg = new CacheConfiguration();
+ ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
- final String cacheName = null;
+ final String cacheName = DEFAULT_CACHE_NAME;
Ignite ignite0 = startGrid(0);
@@ -93,7 +93,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
checkCache(ignite1, cacheName, false, false);
- ccfg = new CacheConfiguration();
+ ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setNearConfiguration(new NearCacheConfiguration());
@@ -124,9 +124,9 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
* @throws Exception If failed.
*/
public void testNearCacheStartError() throws Exception {
- ccfg = new CacheConfiguration();
+ ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
- final String cacheName = null;
+ final String cacheName = DEFAULT_CACHE_NAME;
Ignite ignite0 = startGrid(0);
@@ -163,11 +163,11 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
* @throws Exception If failed.
*/
public void testReplicatedCacheClient() throws Exception {
- ccfg = new CacheConfiguration();
+ ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(REPLICATED);
- final String cacheName = null;
+ final String cacheName = DEFAULT_CACHE_NAME;
Ignite ignite0 = startGrid(0);
@@ -196,13 +196,13 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
* @throws Exception If failed.
*/
public void testReplicatedWithNearCacheClient() throws Exception {
- ccfg = new CacheConfiguration();
+ ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setNearConfiguration(new NearCacheConfiguration());
ccfg.setCacheMode(REPLICATED);
- final String cacheName = null;
+ final String cacheName = DEFAULT_CACHE_NAME;
Ignite ignite0 = startGrid(0);
@@ -239,17 +239,17 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
client = false;
- ignite0.createCache(new CacheConfiguration<>());
+ ignite0.createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
- clientNode.cache(null);
+ clientNode.cache(DEFAULT_CACHE_NAME);
- clientNode.cache(null).close();
+ clientNode.cache(DEFAULT_CACHE_NAME).close();
- clientNode.cache(null);
+ clientNode.cache(DEFAULT_CACHE_NAME);
startGrid(2);
- checkCache(clientNode, null, false, false);
+ checkCache(clientNode, DEFAULT_CACHE_NAME, false, false);
}
/**
@@ -275,7 +275,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
Ignite ignite1 = startGrid(1);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setNodeFilter(new CachePredicate(F.asList(ignite0.name())));
@@ -284,18 +284,18 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
else {
ignite1.createCache(ccfg);
- assertNull(((IgniteKernal)ignite0).context().cache().internalCache(null));
+ assertNull(((IgniteKernal)ignite0).context().cache().internalCache(DEFAULT_CACHE_NAME));
}
- assertNotNull(ignite0.cache(null));
+ assertNotNull(ignite0.cache(DEFAULT_CACHE_NAME));
- ignite0.cache(null).close();
+ ignite0.cache(DEFAULT_CACHE_NAME).close();
- assertNotNull(ignite0.cache(null));
+ assertNotNull(ignite0.cache(DEFAULT_CACHE_NAME));
startGrid(2);
- checkCache(ignite0, null, false, false);
+ checkCache(ignite0, DEFAULT_CACHE_NAME, false, false);
}
/**
@@ -321,9 +321,9 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes
assertEquals(near, disco.cacheNearNode(node, cacheName));
if (srv)
- assertTrue(ignite0.affinity(null).primaryPartitions(node).length > 0);
+ assertTrue(ignite0.affinity(DEFAULT_CACHE_NAME).primaryPartitions(node).length > 0);
else
- assertEquals(0, ignite0.affinity(null).primaryPartitions(node).length);
+ assertEquals(0, ignite0.affinity(DEFAULT_CACHE_NAME).primaryPartitions(node).length);
}
assertNotNull(ignite.cache(cacheName));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java
index 6e4bdf9..a5930c9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java
@@ -56,7 +56,7 @@ public class IgniteExchangeFutureHistoryTest extends IgniteCacheAbstractTest {
* @throws Exception If failed.
*/
public void testExchangeFutures() throws Exception {
- GridCachePartitionExchangeManager mgr = ((IgniteKernal)grid(0)).internalCache().context().shared().exchange();
+ GridCachePartitionExchangeManager mgr = ((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME).context().shared().exchange();
for (int i = 1; i <= 10; i++) {
startGrid(i);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java
index 9f98a90..d2a304d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java
@@ -81,7 +81,7 @@ public class IgniteMarshallerCacheClassNameConflictTest extends GridCommonAbstra
cfg.setDiscoverySpi(disco);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(REPLICATED);
ccfg.setRebalanceMode(SYNC);
@@ -127,7 +127,7 @@ public class IgniteMarshallerCacheClassNameConflictTest extends GridCommonAbstra
break;
}
- Ignition.localIgnite().cache(null).put(1, aOrg1);
+ Ignition.localIgnite().cache(DEFAULT_CACHE_NAME).put(1, aOrg1);
}
});
@@ -148,7 +148,7 @@ public class IgniteMarshallerCacheClassNameConflictTest extends GridCommonAbstra
break;
}
- Ignition.localIgnite().cache(null).put(2, bOrg2);
+ Ignition.localIgnite().cache(DEFAULT_CACHE_NAME).put(2, bOrg2);
}
});
startLatch.countDown();
@@ -163,7 +163,7 @@ public class IgniteMarshallerCacheClassNameConflictTest extends GridCommonAbstra
Ignite ignite = startGrid(2);
- int cacheSize = ignite.cache(null).size(CachePeekMode.PRIMARY);
+ int cacheSize = ignite.cache(DEFAULT_CACHE_NAME).size(CachePeekMode.PRIMARY);
assertTrue("Expected cache size 1 but was " + cacheSize, cacheSize == 1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java
index 362d6a1..f5f2512 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java
@@ -79,7 +79,7 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo
cfg.setDiscoverySpi(disco);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(REPLICATED);
ccfg.setRebalanceMode(SYNC);
@@ -119,13 +119,13 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo
Organization org = new Organization(1, "Microsoft", "One Microsoft Way Redmond, WA 98052-6399, USA");
- srv1.cache(null).put(1, org);
+ srv1.cache(DEFAULT_CACHE_NAME).put(1, org);
clientMode = true;
Ignite cl1 = startGrid(1);
- cl1.cache(null).get(1);
+ cl1.cache(DEFAULT_CACHE_NAME).get(1);
String clsName = Organization.class.getName();
@@ -164,14 +164,14 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo
replaceWithCountingMappingRequestListener(((GridKernalContext)U.field(srv3, "ctx")).io());
- srv3.cache(null).put(
+ srv3.cache(DEFAULT_CACHE_NAME).put(
1, new Organization(1, "Microsoft", "One Microsoft Way Redmond, WA 98052-6399, USA"));
clientMode = true;
Ignite cl1 = startGrid(4);
- cl1.cache(null).get(1);
+ cl1.cache(DEFAULT_CACHE_NAME).get(1);
int result = mappingReqsCounter.get();
@@ -197,14 +197,14 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo
replaceWithCountingMappingRequestListener(((GridKernalContext)U.field(srv3, "ctx")).io());
- srv3.cache(null).put(
+ srv3.cache(DEFAULT_CACHE_NAME).put(
1, new Organization(1, "Microsoft", "One Microsoft Way Redmond, WA 98052-6399, USA"));
clientMode = true;
Ignite cl1 = startGrid(4);
- cl1.cache(null).get(1);
+ cl1.cache(DEFAULT_CACHE_NAME).get(1);
nodeStopLatch.await(5_000, TimeUnit.MILLISECONDS);
@@ -233,14 +233,14 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo
replaceWithCountingMappingRequestListener(((GridKernalContext)U.field(srv3, "ctx")).io());
- srv3.cache(null).put(
+ srv3.cache(DEFAULT_CACHE_NAME).put(
1, new Organization(1, "Microsoft", "One Microsoft Way Redmond, WA 98052-6399, USA"));
clientMode = true;
Ignite cl1 = startGrid(4);
- cl1.cache(null).get(1);
+ cl1.cache(DEFAULT_CACHE_NAME).get(1);
nodeStopLatch.await(5_000, TimeUnit.MILLISECONDS);
@@ -270,7 +270,7 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo
replaceWithStoppingMappingRequestListener(
((GridKernalContext)U.field(srv3, "ctx")).io(), 2, nodeStopLatch);
- srv3.cache(null).put(
+ srv3.cache(DEFAULT_CACHE_NAME).put(
1, new Organization(1, "Microsoft", "One Microsoft Way Redmond, WA 98052-6399, USA"));
clientMode = true;
@@ -278,7 +278,7 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo
Ignite cl1 = startGrid(4);
try {
- cl1.cache(null).get(1);
+ cl1.cache(DEFAULT_CACHE_NAME).get(1);
}
catch (Exception e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java
index dff710c..4e477f2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java
@@ -54,7 +54,7 @@ public class IgniteMarshallerCacheConcurrentReadWriteTest extends GridCommonAbst
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(REPLICATED);
ccfg.setRebalanceMode(SYNC);
@@ -104,7 +104,7 @@ public class IgniteMarshallerCacheConcurrentReadWriteTest extends GridCommonAbst
dataBytes.put(i, ignite.configuration().getMarshaller().marshal(obj));
}
- ignite.cache(null).putAll(data);
+ ignite.cache(DEFAULT_CACHE_NAME).putAll(data);
stopGrid(0);
@@ -119,7 +119,7 @@ public class IgniteMarshallerCacheConcurrentReadWriteTest extends GridCommonAbst
Ignite ignite = startGrid(node);
- IgniteCache<Object, Object> cache = ignite.cache(null);
+ IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
for (Map.Entry<Integer, byte[]> e : dataBytes.entrySet()) {
Object obj = ignite.configuration().getMarshaller().unmarshal(e.getValue(), null);
@@ -127,7 +127,7 @@ public class IgniteMarshallerCacheConcurrentReadWriteTest extends GridCommonAbst
cache.put(e.getKey(), obj);
}
- ignite.cache(null).getAll(dataBytes.keySet());
+ ignite.cache(DEFAULT_CACHE_NAME).getAll(dataBytes.keySet());
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java
index f993a89..55323bb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java
@@ -75,7 +75,7 @@ public class IgniteOnePhaseCommitNearSelfTest extends GridCommonAbstractTest {
* @return Cache configuration.
*/
protected CacheConfiguration cacheConfiguration(String igniteInstanceName) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setBackups(backups);
ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
@@ -98,7 +98,7 @@ public class IgniteOnePhaseCommitNearSelfTest extends GridCommonAbstractTest {
int key = generateNearKey();
- IgniteCache<Object, Object> cache = ignite(0).cache(null);
+ IgniteCache<Object, Object> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
checkKey(ignite(0).transactions(), cache, key);
}
@@ -143,7 +143,7 @@ public class IgniteOnePhaseCommitNearSelfTest extends GridCommonAbstractTest {
@Override public boolean apply() {
try {
for (int i = 0; i < GRID_CNT; i++) {
- GridCacheAdapter<Object, Object> cache = ((IgniteKernal)ignite(i)).internalCache();
+ GridCacheAdapter<Object, Object> cache = ((IgniteKernal)ignite(i)).internalCache(DEFAULT_CACHE_NAME);
GridCacheEntryEx entry = cache.peekEx(key);
@@ -202,7 +202,7 @@ public class IgniteOnePhaseCommitNearSelfTest extends GridCommonAbstractTest {
* @return Key.
*/
protected int generateNearKey() {
- Affinity<Object> aff = ignite(0).affinity(null);
+ Affinity<Object> aff = ignite(0).affinity(DEFAULT_CACHE_NAME);
int key = 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java
index 6d8079c..56a4381 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java
@@ -159,7 +159,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest {
awaitPartitionMapExchange();
try {
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
int keyCnt = 200;
@@ -169,7 +169,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest {
// Create readers if near cache is enabled.
for (int g = 1; g < 2; g++) {
for (int i = 30; i < 70; i++)
- ((IgniteKernal)grid(g)).getCache(null).get(i);
+ ((IgniteKernal)grid(g)).getCache(DEFAULT_CACHE_NAME).get(i);
}
info(">>> Starting test tx.");
@@ -191,7 +191,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest {
for (int g = 0; g < GRID_CNT; g++) {
IgniteKernal k = (IgniteKernal)grid(g);
- GridCacheAdapter<Object, Object> cacheAdapter = k.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> cacheAdapter = k.context().cache().internalCache(DEFAULT_CACHE_NAME);
assertEquals(0, cacheAdapter.context().tm().idMapSize());
@@ -218,12 +218,12 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest {
}
for (int g = 0; g < GRID_CNT; g++) {
- IgniteCache<Object, Object> checkCache =grid(g).cache(null);
+ IgniteCache<Object, Object> checkCache =grid(g).cache(DEFAULT_CACHE_NAME);
ClusterNode checkNode = grid(g).localNode();
for (int i = 0; i < keyCnt; i++) {
- if (grid(g).affinity(null).isPrimaryOrBackup(checkNode, i))
+ if (grid(g).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(checkNode, i))
assertEquals(i * i, checkCache.localPeek(i, CachePeekMode.PRIMARY, CachePeekMode.BACKUP));
}
}
@@ -284,7 +284,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest {
try {
Map<Integer, Integer> checkMap = new HashMap<>();
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int r = 0; r < 3; r++) {
for (int i = 0; i < 10; i++) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
index 7a51bc0..2503e21 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
@@ -77,11 +77,11 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA
try {
for (int i = 0; i < GRID_CNT - 1; i++)
- grid(i).cache(null).rebalance().get();
+ grid(i).cache(DEFAULT_CACHE_NAME).rebalance().get();
startGrid(GRID_CNT - 1);
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
final int keyCnt = 100;
@@ -99,7 +99,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA
for (int g = 0; g < GRID_CNT; g++) {
IgniteKernal k = (IgniteKernal)grid(g);
- GridCacheAdapter<Object, Object> cacheAdapter = k.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> cacheAdapter = k.context().cache().internalCache(DEFAULT_CACHE_NAME);
assertEquals(0, cacheAdapter.context().tm().idMapSize());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
index 54584f1..782b333 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
@@ -52,7 +52,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(atomicityMode());
ccfg.setBackups(1);
@@ -101,7 +101,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
final String val = "val";
try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
- ignite.cache(null).put(key, val);
+ ignite.cache(DEFAULT_CACHE_NAME).put(key, val);
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -125,7 +125,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
final String val = "val";
try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
- ignite.cache(null).put(key, val);
+ ignite.cache(DEFAULT_CACHE_NAME).put(key, val);
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -149,7 +149,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
final String val = "val";
try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
- ignite.cache(null).put(key, val);
+ ignite.cache(DEFAULT_CACHE_NAME).put(key, val);
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -173,7 +173,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
final String val = "val";
try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
- ignite.cache(null).put(key, val);
+ ignite.cache(DEFAULT_CACHE_NAME).put(key, val);
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -197,7 +197,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
final String val = "val";
try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
- ignite.cache(null).put(key, val);
+ ignite.cache(DEFAULT_CACHE_NAME).put(key, val);
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -221,11 +221,11 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
final String val = "val";
try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){
- ignite.cache(null).put(key, val);
+ ignite.cache(DEFAULT_CACHE_NAME).put(key, val);
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
- ignite.destroyCache(null);
+ ignite.destroyCache(DEFAULT_CACHE_NAME);
return null;
}
@@ -246,7 +246,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
final String key = "key";
- Lock lock = ignite.cache(null).lock(key);
+ Lock lock = ignite.cache(DEFAULT_CACHE_NAME).lock(key);
lock.lock();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java
index ab872ee..0c64a79 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java
@@ -41,7 +41,7 @@ public class IgniteStaticCacheStartSelfTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
if (hasCache) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(CacheMode.PARTITIONED);
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java
index eee6dda..f94babe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java
@@ -61,19 +61,18 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac
iCfg.setCacheConfiguration(cCfg0, cCfg1, cCfg2);
for (CacheConfiguration cCfg : iCfg.getCacheConfiguration()) {
- if (cCfg.getName() != null)
- if (cCfg.getName().equals(CACHE_NAME_1))
- cCfg.setTopologyValidator(new TopologyValidator() {
- @Override public boolean validate(Collection<ClusterNode> nodes) {
- return nodes.size() == 2;
- }
- });
- else if (cCfg.getName().equals(CACHE_NAME_2))
- cCfg.setTopologyValidator(new TopologyValidator() {
- @Override public boolean validate(Collection<ClusterNode> nodes) {
- return nodes.size() >= 2;
- }
- });
+ if (cCfg.getName().equals(CACHE_NAME_1))
+ cCfg.setTopologyValidator(new TopologyValidator() {
+ @Override public boolean validate(Collection<ClusterNode> nodes) {
+ return nodes.size() == 2;
+ }
+ });
+ else if (cCfg.getName().equals(CACHE_NAME_2))
+ cCfg.setTopologyValidator(new TopologyValidator() {
+ @Override public boolean validate(Collection<ClusterNode> nodes) {
+ return nodes.size() >= 2;
+ }
+ });
}
return iCfg;
@@ -181,8 +180,8 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac
/** topology validator test. */
public void testTopologyValidator() throws Exception {
- putValid(null);
- remove(null);
+ putValid(DEFAULT_CACHE_NAME);
+ remove(DEFAULT_CACHE_NAME);
putInvalid(CACHE_NAME_1);
removeInvalid(CACHE_NAME_1);
@@ -192,8 +191,8 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac
startGrid(1);
- putValid(null);
- remove(null);
+ putValid(DEFAULT_CACHE_NAME);
+ remove(DEFAULT_CACHE_NAME);
putValid(CACHE_NAME_1);
@@ -202,8 +201,8 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac
startGrid(2);
- putValid(null);
- remove(null);
+ putValid(DEFAULT_CACHE_NAME);
+ remove(DEFAULT_CACHE_NAME);
getInvalid(CACHE_NAME_1);
putInvalid(CACHE_NAME_1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java
index fd386bb..7949c50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java
@@ -53,21 +53,21 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT
try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) {
putValid(CACHE_NAME_1);
- putValid(null);
+ putValid(DEFAULT_CACHE_NAME);
putValid(CACHE_NAME_2);
commitFailed(tx);
}
- assertEmpty(null); // rolled back
+ assertEmpty(DEFAULT_CACHE_NAME); // rolled back
assertEmpty(CACHE_NAME_1); // rolled back
assertEmpty(CACHE_NAME_2); // rolled back
try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) {
- putValid(null);
+ putValid(DEFAULT_CACHE_NAME);
putInvalid(CACHE_NAME_1);
}
- assertEmpty(null); // rolled back
+ assertEmpty(DEFAULT_CACHE_NAME); // rolled back
assertEmpty(CACHE_NAME_1); // rolled back
startGrid(1);
@@ -89,11 +89,11 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT
startGrid(2);
try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) {
- putValid(null);
+ putValid(DEFAULT_CACHE_NAME);
putInvalid(CACHE_NAME_1);
}
- assertEmpty(null); // rolled back
+ assertEmpty(DEFAULT_CACHE_NAME); // rolled back
assertEmpty(CACHE_NAME_1); // rolled back
try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) {
@@ -106,21 +106,21 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT
}
try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) {
- putValid(null);
+ putValid(DEFAULT_CACHE_NAME);
putValid(CACHE_NAME_2);
tx.commit();
}
- remove(null);
+ remove(DEFAULT_CACHE_NAME);
remove(CACHE_NAME_2);
try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) {
- putValid(null);
+ putValid(DEFAULT_CACHE_NAME);
putValid(CACHE_NAME_2);
tx.commit();
}
- remove(null);
+ remove(DEFAULT_CACHE_NAME);
remove(CACHE_NAME_2);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java
index 3f9ed55..fd77309 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java
@@ -90,7 +90,7 @@ public class IgniteTopologyValidatorGridSplitCacheTest extends GridCommonAbstrac
CacheConfiguration[] ccfgs = new CacheConfiguration[CACHES_CNT];
for (int cnt = 0; cnt < CACHES_CNT; cnt++) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(testCacheName(cnt));
ccfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
index 694101c..5340f63 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
@@ -187,7 +187,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
int part = aff.partition(key);
debug("Key affinity [key=" + key + ", partition=" + part + ", affinity=" +
- U.toShortString(ignite(gridIdx).affinity(null).mapPartitionToPrimaryAndBackups(part)) + ']');
+ U.toShortString(ignite(gridIdx).affinity(DEFAULT_CACHE_NAME).mapPartitionToPrimaryAndBackups(part)) + ']');
}
String val = Integer.toString(key);
@@ -253,7 +253,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
if (printMemoryStats()) {
if (cntr.getAndIncrement() % 100 == 0)
// Print transaction memory stats.
- ((IgniteKernal)grid(gridIdx)).internalCache().context().tm().printMemoryStats();
+ ((IgniteKernal)grid(gridIdx)).internalCache(DEFAULT_CACHE_NAME).context().tm().printMemoryStats();
}
}
@@ -295,7 +295,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
int part = aff.partition(key);
debug("Key affinity [key=" + key + ", partition=" + part + ", affinity=" +
- U.toShortString(ignite(gridIdx).affinity(null).mapPartitionToPrimaryAndBackups(part)) + ']');
+ U.toShortString(ignite(gridIdx).affinity(DEFAULT_CACHE_NAME).mapPartitionToPrimaryAndBackups(part)) + ']');
}
String val = Integer.toString(key);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java
index 04f0c99..5fb0766 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java
@@ -72,7 +72,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra
* @return Near cache.
*/
GridNearCacheAdapter<String, Integer> near(Ignite g) {
- return (GridNearCacheAdapter<String, Integer>)((IgniteKernal)g).<String, Integer>internalCache();
+ return (GridNearCacheAdapter<String, Integer>)((IgniteKernal)g).<String, Integer>internalCache(DEFAULT_CACHE_NAME);
}
/**
@@ -94,7 +94,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra
final Ignite ignite = grid();
- ignite.cache(null).put(key, "val");
+ ignite.cache(DEFAULT_CACHE_NAME).put(key, "val");
GridCacheEntryEx dhtEntry = dht(ignite).peekEx(key);
@@ -128,7 +128,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra
info("DHT entry [hash=" + System.identityHashCode(dhtEntry) + ", xid=" + tx.xid() +
", entry=" + dhtEntry + ']');
- String val = ignite.<String, String>cache(null).get(key);
+ String val = ignite.<String, String>cache(DEFAULT_CACHE_NAME).get(key);
assertNotNull(val);
assertEquals("val", val);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
index 4fd4989..5c3aa81 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
@@ -75,7 +75,7 @@ public class IgniteTxConfigCacheSelfTest extends GridCommonAbstractTest {
cfg.setCommunicationSpi(commSpi);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(CACHE_NAME);
ccfg.setAtomicityMode(atomicityMode());
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
index c60d718..1d27524 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
@@ -116,7 +116,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
}
for (int key = 0; key <= lastKey; key++)
- grid(0).cache(null).remove(key);
+ grid(0).cache(DEFAULT_CACHE_NAME).remove(key);
assertEquals(0, jcache(0).size(CachePeekMode.ALL));
}
@@ -315,7 +315,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']');
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
if (putBefore) {
TestIndexingSpi.forceFail(false);
@@ -338,7 +338,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++) {
for (Integer key : keys)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
}
TestIndexingSpi.forceFail(true);
@@ -368,7 +368,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
checkUnlocked(key);
for (int i = 0; i < gridCount(); i++)
- assertEquals(0, ((IgniteKernal)ignite(0)).internalCache(null).context().tm().idMapSize());
+ assertEquals(0, ((IgniteKernal)ignite(0)).internalCache(DEFAULT_CACHE_NAME).context().tm().idMapSize());
}
/**
@@ -390,7 +390,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
@Override public boolean apply() {
IgniteKernal grid = (IgniteKernal)grid(idx);
- GridCacheAdapter cache = grid.internalCache(null);
+ GridCacheAdapter cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheEntryEx entry = cache.peekEx(key);
@@ -449,12 +449,12 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
info("Put key: " + key);
- grid(0).cache(null).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(key, 1);
}
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
TestIndexingSpi.forceFail(true);
@@ -462,7 +462,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- grid(0).cache(null).put(key, 2);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(key, 2);
return null;
}
@@ -482,12 +482,12 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
info("Put key: " + key);
- grid(0).cache(null).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(key, 1);
}
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
TestIndexingSpi.forceFail(true);
@@ -495,7 +495,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
Throwable e = GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- grid(0).<Integer, Integer>cache(null).invoke(key, new EntryProcessor<Integer, Integer, Void>() {
+ grid(0).<Integer, Integer>cache(DEFAULT_CACHE_NAME).invoke(key, new EntryProcessor<Integer, Integer, Void>() {
@Override public Void process(MutableEntry<Integer, Integer> e, Object... args) {
e.setValue(2);
@@ -530,13 +530,13 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
info("Put data: " + m);
- grid(0).cache(null).putAll(m);
+ grid(0).cache(DEFAULT_CACHE_NAME).putAll(m);
}
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++) {
for (Integer key : keys)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
}
TestIndexingSpi.forceFail(true);
@@ -550,7 +550,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- grid(0).cache(null).putAll(m);
+ grid(0).cache(DEFAULT_CACHE_NAME).putAll(m);
return null;
}
@@ -571,12 +571,12 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
info("Put key: " + key);
- grid(0).cache(null).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(key, 1);
}
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
TestIndexingSpi.forceFail(true);
@@ -584,7 +584,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- grid(0).cache(null).remove(key);
+ grid(0).cache(DEFAULT_CACHE_NAME).remove(key);
return null;
}
@@ -601,7 +601,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
* @return Key.
*/
private Integer keyForNode(ClusterNode node, int type) {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == LOCAL)
return ++lastKey;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
index b170ac3..3df934f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
@@ -118,7 +118,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
*/
@SuppressWarnings("unchecked")
private static UUID primaryId(Ignite ignite, Object key) {
- Affinity aff = ignite.affinity(null);
+ Affinity aff = ignite.affinity(DEFAULT_CACHE_NAME);
Collection<ClusterNode> affNodes = aff.mapPartitionToPrimaryAndBackups(aff.partition(key));
@@ -138,7 +138,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
Ignite g = G.ignite(nodeId);
GridDhtCacheAdapter<Object, Integer> dht =
- ((IgniteKernal)g).<Object, Integer>internalCache().context().near().dht();
+ ((IgniteKernal)g).<Object, Integer>internalCache(DEFAULT_CACHE_NAME).context().near().dht();
return dht.peekEx(key);
}
@@ -151,7 +151,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
@Nullable private static GridCacheEntryEx nearEntry(UUID nodeId, Object key) {
Ignite g = G.ignite(nodeId);
- GridNearCacheAdapter<Object, Integer> near = ((IgniteKernal)g).<Object, Integer>internalCache().context().near();
+ GridNearCacheAdapter<Object, Integer> near = ((IgniteKernal)g).<Object, Integer>internalCache(DEFAULT_CACHE_NAME).context().near();
return near.peekEx(key);
}
@@ -165,7 +165,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
*/
@SuppressWarnings("unchecked")
private void onItemNear(boolean putCntr, Ignite ignite, String itemKey, int retry) {
- IgniteCache<String, Integer> cache = ignite.cache(null);
+ IgniteCache<String, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
UUID locId = ignite.cluster().localNode().id();
UUID itemPrimaryId = primaryId(ignite, itemKey);
@@ -216,7 +216,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
*/
@SuppressWarnings("unchecked")
private void onItemPrimary(boolean putCntr, Ignite ignite, String itemKey, int retry) {
- IgniteCache<String, Integer> cache = ignite.cache(null);
+ IgniteCache<String, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
UUID locId = ignite.cluster().localNode().id();
UUID itemPrimaryId = primaryId(ignite, itemKey);
@@ -269,7 +269,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
*/
@SuppressWarnings("unchecked")
private void onRemoveItemQueried(boolean putCntr, Ignite ignite, int retry) throws IgniteCheckedException {
- IgniteCache<String, Integer> cache = ignite.cache(null);
+ IgniteCache<String, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
UUID locId = ignite.cluster().localNode().id();
UUID cntrPrimaryId = primaryId(ignite, RMVD_CNTR_KEY);
@@ -358,7 +358,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
*/
@SuppressWarnings("unchecked")
private void onRemoveItemSimple(boolean putCntr, Ignite ignite, int retry) {
- IgniteCache<String, Integer> cache = ignite.cache(null);
+ IgniteCache<String, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
UUID locId = ignite.cluster().localNode().id();
UUID cntrPrimaryId = primaryId(ignite, RMVD_CNTR_KEY);
@@ -465,7 +465,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
onRemoveItemQueried(putCntr, ignite, i);
if (i % 50 == 0)
- ((IgniteKernal) ignite).internalCache().context().tm().printMemoryStats();
+ ((IgniteKernal) ignite).internalCache(DEFAULT_CACHE_NAME).context().tm().printMemoryStats();
}
}
@@ -500,7 +500,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
startGrids(GRID_CNT);
try {
- grid(0).cache(null).put(CNTR_KEY, 0);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(CNTR_KEY, 0);
grid(0).compute().call(new PutOneEntryInTxJob());
}
@@ -520,13 +520,13 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
startGrids(GRID_CNT);
try {
- grid(0).cache(null).put(CNTR_KEY, 0);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(CNTR_KEY, 0);
grid(0).compute().call(new PutTwoEntriesInTxJob());
printCounter();
- assertEquals(GRID_CNT * RETRIES, grid(0).cache(null).get(CNTR_KEY));
+ assertEquals(GRID_CNT * RETRIES, grid(0).cache(DEFAULT_CACHE_NAME).get(CNTR_KEY));
}
finally {
stopAllGrids();
@@ -547,7 +547,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
try {
// Initialize.
- grid(0).cache(null).put(CNTR_KEY, 0);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(CNTR_KEY, 0);
for (int i = 0; i < GRID_CNT; i++) {
final int gridId = i;
@@ -585,7 +585,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
Collection<Thread> threads = new LinkedList<>();
try {
- grid(0).cache(null).put(CNTR_KEY, 0);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(CNTR_KEY, 0);
for (int i = 0; i < GRID_CNT; i++) {
final int gridId = i;
@@ -605,7 +605,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
printCounter();
- assertEquals(GRID_CNT * RETRIES, grid(0).cache(null).get(CNTR_KEY));
+ assertEquals(GRID_CNT * RETRIES, grid(0).cache(DEFAULT_CACHE_NAME).get(CNTR_KEY));
}
finally {
stopAllGrids();
@@ -623,7 +623,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
startGrids(GRID_CNT);
try {
- IgniteCache<String, Integer> cache = grid(0).cache(null);
+ IgniteCache<String, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(RMVD_CNTR_KEY, 0);
@@ -632,7 +632,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
for (int i = 0; i < RETRIES; i++)
for (int j = 0; j < GRID_CNT; j++)
- assertEquals(i, grid(j).cache(null).get(String.valueOf(i)));
+ assertEquals(i, grid(j).cache(DEFAULT_CACHE_NAME).get(String.valueOf(i)));
Collection<Cache.Entry<String, Integer>> entries =
cache.query(new SqlQuery<String, Integer>(Integer.class, " _val >= 0")).getAll();
@@ -645,9 +645,9 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
for (int i = 0; i < GRID_CNT * RETRIES; i++)
for (int ii = 0; ii < GRID_CNT; ii++)
- assertEquals(null, grid(ii).cache(null).get(Integer.toString(i)));
+ assertEquals(null, grid(ii).cache(DEFAULT_CACHE_NAME).get(Integer.toString(i)));
- assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP));
+ assertEquals(-GRID_CNT * RETRIES, grid(0).cache(DEFAULT_CACHE_NAME).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP));
}
finally {
stopAllGrids();
@@ -663,7 +663,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
startGrids(GRID_CNT);
try {
- IgniteCache<String, Integer> cache = grid(0).cache(null);
+ IgniteCache<String, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(RMVD_CNTR_KEY, 0);
@@ -672,7 +672,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
for (int i = 0; i < RETRIES; i++)
for (int j = 0; j < GRID_CNT; j++)
- assertEquals(i, grid(j).cache(null).get(Integer.toString(i)));
+ assertEquals(i, grid(j).cache(DEFAULT_CACHE_NAME).get(Integer.toString(i)));
Collection<Cache.Entry<String, Integer>> entries =
cache.query(new SqlQuery<String, Integer>(Integer.class, " _val >= 0")).getAll();
@@ -686,14 +686,14 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
// Check using cache.
for (int i = 0; i < GRID_CNT * RETRIES; i++)
for (int ii = 0; ii < GRID_CNT; ii++)
- assertEquals(null, grid(ii).cache(null).get(Integer.toString(i)));
+ assertEquals(null, grid(ii).cache(DEFAULT_CACHE_NAME).get(Integer.toString(i)));
// Check using query.
entries = cache.query(new SqlQuery<String, Integer>(Integer.class, " _val >= 0")).getAll();
assertTrue(entries.isEmpty());
- assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP));
+ assertEquals(-GRID_CNT * RETRIES, grid(0).cache(DEFAULT_CACHE_NAME).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP));
}
finally {
stopAllGrids();
@@ -713,7 +713,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
try {
startGrids(GRID_CNT);
- IgniteCache<String, Integer> cache = grid(0).cache(null);
+ IgniteCache<String, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
// Store counter.
cache.getAndPut(RMVD_CNTR_KEY, 0);
@@ -723,11 +723,11 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
cache.getAndPut(String.valueOf(i), i);
for (int j = 0; j < GRID_CNT; j++)
- assertEquals(0, grid(j).cache(null).get(RMVD_CNTR_KEY));
+ assertEquals(0, grid(j).cache(DEFAULT_CACHE_NAME).get(RMVD_CNTR_KEY));
for (int i = 1; i <= RETRIES; i++)
for (int j = 0; j < GRID_CNT; j++)
- assertEquals(i, grid(j).cache(null).get(String.valueOf(i)));
+ assertEquals(i, grid(j).cache(DEFAULT_CACHE_NAME).get(String.valueOf(i)));
SqlQuery<String, Integer> qry = new SqlQuery<>(Integer.class, "_val >= 0");
@@ -779,9 +779,9 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
for (int i = 0; i < GRID_CNT * RETRIES; i++)
for (int ii = 0; ii < GRID_CNT; ii++)
assertEquals("Got invalid value from cache [gridIdx=" + ii + ", key=" + i + ']',
- null, grid(ii).cache(null).get(Integer.toString(i)));
+ null, grid(ii).cache(DEFAULT_CACHE_NAME).get(Integer.toString(i)));
- assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP));
+ assertEquals(-GRID_CNT * RETRIES, grid(0).cache(DEFAULT_CACHE_NAME).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP));
}
finally {
stopAllGrids();
@@ -793,8 +793,8 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
*/
private void printCounter() {
info("***");
- info("*** Peeked counter: " + grid(0).cache(null).localPeek(CNTR_KEY, CachePeekMode.ONHEAP));
- info("*** Got counter: " + grid(0).cache(null).get(CNTR_KEY));
+ info("*** Peeked counter: " + grid(0).cache(DEFAULT_CACHE_NAME).localPeek(CNTR_KEY, CachePeekMode.ONHEAP));
+ info("*** Got counter: " + grid(0).cache(DEFAULT_CACHE_NAME).get(CNTR_KEY));
info("***");
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
index 07e30e8..5a1a1db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
@@ -219,7 +219,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract
* @throws Exception If failed.
*/
public void testOptimisticSerializableConsistency() throws Exception {
- final IgniteCache<Integer, Long> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Long> cache = grid(0).cache(DEFAULT_CACHE_NAME);
final int THREADS = 3;
@@ -310,7 +310,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract
}
for (int i = 0; i < gridCount(); i++)
- assertEquals(total, grid(i).cache(null).get(key));
+ assertEquals(total, grid(i).cache(DEFAULT_CACHE_NAME).get(key));
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java
index 74555d2..39066a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java
@@ -102,7 +102,7 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract
startGridsMultiThreaded(gridCount(), true);
try {
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
// Find test key.
int key = testKey();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
index 47471f9..872fe77 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
@@ -302,7 +302,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']');
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
if (putBefore) {
store.forceFail(false);
@@ -325,7 +325,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++) {
for (Integer key : keys)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
}
store.forceFail(true);
@@ -368,7 +368,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
for (int i = 0; i < gridCount(); i++) {
IgniteKernal grid = (IgniteKernal)grid(i);
- GridCacheAdapter cache = grid.internalCache(null);
+ GridCacheAdapter cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheMapEntry entry = cache.map().getEntry(cache.context().toCacheKeyObject(key));
@@ -398,7 +398,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
}
for (int i = 0; i < gridCount(); i++)
- assertEquals("Unexpected value for grid " + i, putBefore ? 1 : null, grid(i).cache(null).get(key));
+ assertEquals("Unexpected value for grid " + i, putBefore ? 1 : null, grid(i).cache(DEFAULT_CACHE_NAME).get(key));
}
/**
@@ -412,12 +412,12 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
info("Put key: " + key);
- grid(0).cache(null).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(key, 1);
}
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
store.forceFail(true);
@@ -425,7 +425,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- grid(0).cache(null).put(key, 2);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(key, 2);
return null;
}
@@ -445,12 +445,12 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
info("Put key: " + key);
- grid(0).cache(null).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(key, 1);
}
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
store.forceFail(true);
@@ -458,7 +458,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
Throwable e = GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- grid(0).<Integer, Integer>cache(null).invoke(key, new EntryProcessor<Integer, Integer, Void>() {
+ grid(0).<Integer, Integer>cache(DEFAULT_CACHE_NAME).invoke(key, new EntryProcessor<Integer, Integer, Void>() {
@Override public Void process(MutableEntry<Integer, Integer> e, Object... args) {
e.setValue(2);
@@ -493,13 +493,13 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
info("Put data: " + m);
- grid(0).cache(null).putAll(m);
+ grid(0).cache(DEFAULT_CACHE_NAME).putAll(m);
}
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++) {
for (Integer key : keys)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
}
store.forceFail(true);
@@ -513,7 +513,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- grid(0).cache(null).putAll(m);
+ grid(0).cache(DEFAULT_CACHE_NAME).putAll(m);
return null;
}
@@ -534,12 +534,12 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
info("Put key: " + key);
- grid(0).cache(null).put(key, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(key, 1);
}
// Execute get from all nodes to create readers for near cache.
for (int i = 0; i < gridCount(); i++)
- grid(i).cache(null).get(key);
+ grid(i).cache(DEFAULT_CACHE_NAME).get(key);
store.forceFail(true);
@@ -547,7 +547,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- grid(0).cache(null).remove(key);
+ grid(0).cache(DEFAULT_CACHE_NAME).remove(key);
return null;
}
@@ -564,7 +564,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
* @return Key.
*/
private Integer keyForNode(ClusterNode node, int type) {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == LOCAL)
return ++lastKey;