You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/27 07:17:15 UTC
[13/37] 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/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index 9c08f0d..0ca10f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -104,8 +104,8 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
try {
Integer mainKey = 0;
- ClusterNode priNode = ignite.affinity(null).mapKeyToNode(mainKey);
- ClusterNode backupNode = F.first(F.view(ignite.affinity(null).mapKeyToPrimaryAndBackups(mainKey),
+ ClusterNode priNode = ignite.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(mainKey);
+ ClusterNode backupNode = F.first(F.view(ignite.affinity(DEFAULT_CACHE_NAME).mapKeyToPrimaryAndBackups(mainKey),
F.notIn(F.asList(priNode))));
ClusterNode otherNode = F.first(ignite.cluster().forPredicate(F.notIn(F.asList(priNode, backupNode))).nodes());
@@ -123,7 +123,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
// Update main key from all nodes.
for (Ignite g : ignites)
- g.cache(null).put(mainKey, ++cntr);
+ g.cache(DEFAULT_CACHE_NAME).put(mainKey, ++cntr);
info("Updated mainKey from all nodes.");
@@ -137,10 +137,10 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
Ignite g = F.rand(ignites);
- g.cache(null).put(new AffinityKey<>(i, mainKey), Integer.toString(cntr++));
+ g.cache(DEFAULT_CACHE_NAME).put(new AffinityKey<>(i, mainKey), Integer.toString(cntr++));
}
- IgniteCache cache = priIgnite.cache(null);
+ IgniteCache cache = priIgnite.cache(DEFAULT_CACHE_NAME);
Transaction tx = priIgnite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ);
@@ -169,7 +169,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
ignites = F.asList(otherIgnite, newIgnite);
for (Ignite g : ignites) {
- GridNearCacheAdapter near = ((IgniteKernal)g).internalCache().context().near();
+ GridNearCacheAdapter near = ((IgniteKernal)g).internalCache(DEFAULT_CACHE_NAME).context().near();
GridDhtCacheAdapter dht = near.dht();
checkTm(g, near.context().tm());
@@ -204,7 +204,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
*/
private void testReadersUpdate(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception {
Ignite ignite = grid(0);
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
try (Transaction tx = ignite.transactions().txStart(concurrency, isolation)) {
for (int i = 0; i < 100; i++)
@@ -215,7 +215,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
// Create readers.
for (int g = 0; g < GRID_CNT; g++) {
- IgniteCache<Integer, Integer> c = grid(g).cache(null);
+ IgniteCache<Integer, Integer> c = grid(g).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++)
assertEquals((Integer)1, c.get(i));
@@ -229,7 +229,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
}
for (int g = 0; g < GRID_CNT; g++) {
- IgniteCache<Integer, Integer> c = grid(g).cache(null);
+ IgniteCache<Integer, Integer> c = grid(g).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++)
assertEquals((Integer)2, c.get(i));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
index c5ba890..4bcaf88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
@@ -93,7 +93,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends
* @return Affinity.
*/
static Affinity<Object> affinity(Ignite ignite) {
- return ignite.affinity(null);
+ return ignite.affinity(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/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index db3954a..b53177b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -104,7 +104,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
* @return Affinity.
*/
static Affinity<Object> affinity(Ignite ignite) {
- return ignite.affinity(null);
+ return ignite.affinity(DEFAULT_CACHE_NAME);
}
/**
@@ -159,13 +159,13 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
/** @param g Grid. */
private static void partitionMap(Ignite g) {
X.println(">>> Full partition map for grid: " + g.name());
- X.println(">>> " + dht(g.cache(null)).topology().partitionMap(false).toFullString());
+ X.println(">>> " + dht(g.cache(DEFAULT_CACHE_NAME)).topology().partitionMap(false).toFullString());
}
/** @throws Exception If failed. */
@SuppressWarnings("BusyWait")
private void waitTopologyUpdate() throws Exception {
- GridTestUtils.waitTopologyUpdate(null, BACKUPS, log());
+ GridTestUtils.waitTopologyUpdate(DEFAULT_CACHE_NAME, BACKUPS, log());
}
/** @throws Exception If failed. */
@@ -174,7 +174,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
Ignite mg = grid(0);
- IgniteCache<Integer, String> mc = mg.cache(null);
+ IgniteCache<Integer, String> mc = mg.cache(DEFAULT_CACHE_NAME);
int keyCnt = 10;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
index 29c2643..eef5aeb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
@@ -50,14 +50,14 @@ public class GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest extends Grid
*
*/
public void testMapKeysToNodes() {
- grid(0).affinity(null).mapKeysToNodes(Arrays.asList("1", "2"));
+ grid(0).affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(Arrays.asList("1", "2"));
}
/**
*
*/
public void testMapKeyToNode() {
- assert grid(0).affinity(null).mapKeyToNode("1") == null;
+ assert grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToNode("1") == null;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
index f5ec2c2..d6f9baf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
@@ -109,7 +109,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT
* @return Cache.
*/
private IgniteCache<String, Integer> cache(ClusterNode node) {
- return G.ignite(node.id()).cache(null);
+ return G.ignite(node.id()).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/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
index 29979cf..3c57957 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
@@ -92,10 +92,10 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom
Integer key = 0;
- while (grid(idx).affinity(null).mapKeyToNode(key).id().equals(grid(0).localNode().id()))
+ while (grid(idx).affinity(DEFAULT_CACHE_NAME).mapKeyToNode(key).id().equals(grid(0).localNode().id()))
key++;
- ClusterNode node = grid(idx).affinity(null).mapKeyToNode(key);
+ ClusterNode node = grid(idx).affinity(DEFAULT_CACHE_NAME).mapKeyToNode(key);
info("Primary node for key [id=" + node.id() + ", order=" + node.order() + ", key=" + key + ']');
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
index 8b1d479..20c32c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
@@ -104,7 +104,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
doPutAndRollback();
GridCacheAdapter<Integer, Integer> c =
- ((GridNearCacheAdapter<Integer, Integer>)((IgniteKernal)grid()).internalCache().<Integer, Integer>cache()).dht();
+ ((GridNearCacheAdapter<Integer, Integer>)((IgniteKernal)grid()).internalCache(DEFAULT_CACHE_NAME).<Integer, Integer>cache()).dht();
assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
index b790975..c10e348 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
@@ -60,7 +60,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
* @throws Exception If failed.
*/
public void testPartitionEntrySetToString() throws Exception {
- GridCacheAdapter<String, Integer> cache = ((IgniteKernal)grid(0)).internalCache();
+ GridCacheAdapter<String, Integer> cache = ((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++) {
String key = String.valueOf(i);
@@ -79,15 +79,15 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
*/
public void testUpdate() throws Exception {
if (gridCount() > 1) {
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
Integer key = nearKey(cache);
- primaryCache(key, null).put(key, 1);
+ primaryCache(key, DEFAULT_CACHE_NAME).put(key, 1);
assertEquals(1, cache.get(key));
- primaryCache(key, null).put(key, 2);
+ primaryCache(key, DEFAULT_CACHE_NAME).put(key, 2);
if (cache.getConfiguration(CacheConfiguration.class).getNearConfiguration() != null)
assertEquals(2, cache.localPeek(key));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
index 19decc9..0c48e78 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
@@ -114,7 +114,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
long misses = 0;
for (int i = 0; i < GRID_CNT; i++) {
- CacheMetrics m = grid(i).cache(null).localMetrics();
+ CacheMetrics m = grid(i).cache(DEFAULT_CACHE_NAME).localMetrics();
hits += m.getCacheHits();
misses += m.getCacheMisses();
@@ -135,7 +135,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
* @param g Grid.
*/
private static void realTimePopulate(final Ignite g) {
- try (IgniteDataStreamer<Integer, Long> ldr = g.dataStreamer(null)) {
+ try (IgniteDataStreamer<Integer, Long> ldr = g.dataStreamer(DEFAULT_CACHE_NAME)) {
// Sets max values to 1 so cache metrics have correct values.
ldr.perNodeParallelOperations(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
index 69310a7..9474950 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
@@ -103,7 +103,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes
else
cache.localLoadCache(null, PUT_CNT);
- Affinity<Integer> aff = grid(0).affinity(null);
+ Affinity<Integer> aff = grid(0).affinity(DEFAULT_CACHE_NAME);
int[] parts = aff.allPartitions(grid(0).localNode());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 403a770..6d5302f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -143,7 +143,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
* @return Near cache.
*/
private static 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);
}
/**
@@ -245,7 +245,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
X.println("*** Retries: " + RETRIES);
X.println("*** Log frequency: " + LOG_FREQ);
- Affinity<String> aff = affinity(grid(0).<String, Integer>cache(null));
+ Affinity<String> aff = affinity(grid(0).<String, Integer>cache(DEFAULT_CACHE_NAME));
Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY);
@@ -265,8 +265,8 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
final UUID priId = pri.cluster().localNode().id();
// Initialize.
- pri.cache(null).put(CNTR_KEY, 0);
-// nears.get(0).cache(null).put(CNTR_KEY, 0);
+ pri.cache(DEFAULT_CACHE_NAME).put(CNTR_KEY, 0);
+// nears.get(0).cache(DEFAULT_CACHE_NAME).put(CNTR_KEY, 0);
assertNull(near(pri).peekEx(CNTR_KEY));
@@ -312,7 +312,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
if (DEBUG)
info("***");
- IgniteCache<String, Integer> c = pri.cache(null);
+ IgniteCache<String, Integer> c = pri.cache(DEFAULT_CACHE_NAME);
Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP);
@@ -411,7 +411,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
if (DEBUG)
info("***");
- IgniteCache<String, Integer> c = near.cache(null);
+ IgniteCache<String, Integer> c = near.cache(DEFAULT_CACHE_NAME);
Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP);
@@ -496,7 +496,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
dht(g).context().tm().printMemoryStats();
near(g).context().tm().printMemoryStats();
- IgniteCache<String, Integer> cache = grid(i).cache(null);
+ IgniteCache<String, Integer> cache = grid(i).cache(DEFAULT_CACHE_NAME);
int cntr = nearThreads > 0 && nears.contains(g) ? cache.get(CNTR_KEY) : cache.localPeek(CNTR_KEY);
@@ -541,7 +541,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
* @throws Exception If failed.
*/
private void checkNearAndPrimaryMultiNode(int gridCnt) throws Exception {
- Affinity<String> aff = affinity(grid(0).<String, Integer>cache(null));
+ Affinity<String> aff = affinity(grid(0).<String, Integer>cache(DEFAULT_CACHE_NAME));
Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY);
@@ -550,7 +550,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
Ignite pri = G.ignite(F.first(affNodes).id());
// Initialize.
- pri.cache(null).put(CNTR_KEY, 0);
+ pri.cache(DEFAULT_CACHE_NAME).put(CNTR_KEY, 0);
assertNull(near(pri).peekEx(CNTR_KEY));
@@ -576,7 +576,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
for (int i = 0; i < gridCnt; i++) {
Ignite g = grid(i);
- IgniteCache<String, Integer> cache = grid(i).cache(null);
+ IgniteCache<String, Integer> cache = grid(i).cache(DEFAULT_CACHE_NAME);
int cntr = cache.localPeek(CNTR_KEY);
@@ -640,7 +640,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
if (DEBUG)
log.info("***");
- IgniteCache<String, Integer> c = near.cache(null);
+ IgniteCache<String, Integer> c = near.cache(DEFAULT_CACHE_NAME);
Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP);
@@ -711,7 +711,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
if (DEBUG)
log.info("***");
- IgniteCache<String, Integer> c = pri.cache(null);
+ IgniteCache<String, Integer> c = pri.cache(DEFAULT_CACHE_NAME);
Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index e5b72f8..4450eb6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -79,8 +79,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
for (int i = 0; i < size; i++)
putMap.put(i, i * i);
- IgniteCache<Object, Object> c0 = grid(0).cache(null);
- IgniteCache<Object, Object> c1 = grid(1).cache(null);
+ IgniteCache<Object, Object> c0 = grid(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> c1 = grid(1).cache(DEFAULT_CACHE_NAME);
c0.putAll(putMap);
@@ -106,8 +106,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
for (int i = 0; i < size; i++)
putMap.put(i, i);
- IgniteCache<Object, Object> prj0 = grid(0).cache(null);
- IgniteCache<Object, Object> prj1 = grid(1).cache(null);
+ IgniteCache<Object, Object> prj0 = grid(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> prj1 = grid(1).cache(DEFAULT_CACHE_NAME);
prj0.putAll(putMap);
@@ -140,7 +140,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
final int size = 10;
- IgniteCache<Object, Object> cache0 = grid(0).cache(null);
+ IgniteCache<Object, Object> cache0 = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < size; i++) {
info("Putting value [i=" + i + ']');
@@ -183,7 +183,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
Integer nearPeekVal = nearEnabled ? 1 : null;
- Affinity<Object> aff = ignite(i).affinity(null);
+ Affinity<Object> aff = ignite(i).affinity(DEFAULT_CACHE_NAME);
info("Affinity nodes [nodes=" + F.nodeIds(aff.mapKeyToPrimaryAndBackups("key")) +
", locNode=" + ignite(i).cluster().localNode().id() + ']');
@@ -217,12 +217,12 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
IgniteCache<String, Integer> c = jcache(i);
- if (grid(i).affinity(null).isBackup(grid(i).localNode(), "key")) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isBackup(grid(i).localNode(), "key")) {
assert c.localPeek("key", NEAR) == null;
assert c.localPeek("key", PRIMARY, BACKUP) == 1;
}
- else if (!grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), "key")) {
+ else if (!grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), "key")) {
// Initialize near reader.
assertEquals((Integer)1, jcache(i).get("key"));
@@ -269,15 +269,15 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
info("Generating keys for test [nodes=" + ignite0.name() + ", " + ignite1.name() + ", " + ignite2.name() + ']');
- IgniteCache<String, Integer> cache0 = ignite0.cache(null);
+ IgniteCache<String, Integer> cache0 = ignite0.cache(DEFAULT_CACHE_NAME);
int val = 0;
for (int i = 0; i < 10_000 && keys.size() < 5; i++) {
String key = String.valueOf(i);
- if (ignite(0).affinity(null).isPrimary(ignite0.localNode(), key) &&
- ignite(0).affinity(null).isBackup(ignite1.localNode(), key)) {
+ if (ignite(0).affinity(DEFAULT_CACHE_NAME).isPrimary(ignite0.localNode(), key) &&
+ ignite(0).affinity(DEFAULT_CACHE_NAME).isBackup(ignite1.localNode(), key)) {
keys.add(key);
cache0.put(key, val++);
@@ -288,7 +288,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
info("Finished generating keys for test.");
- IgniteCache<String, Integer> cache2 = ignite2.cache(null);
+ IgniteCache<String, Integer> cache2 = ignite2.cache(DEFAULT_CACHE_NAME);
assertEquals(Integer.valueOf(0), cache2.get(keys.get(0)));
assertEquals(Integer.valueOf(1), cache2.get(keys.get(1)));
@@ -296,7 +296,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
assertEquals(0, cache0.localSize(NEAR));
assertEquals(5, cache0.localSize(CachePeekMode.ALL) - cache0.localSize(NEAR));
- IgniteCache<String, Integer> cache1 = ignite1.cache(null);
+ IgniteCache<String, Integer> cache1 = ignite1.cache(DEFAULT_CACHE_NAME);
assertEquals(0, cache1.localSize(NEAR));
assertEquals(5, cache1.localSize(CachePeekMode.ALL) - cache1.localSize(NEAR));
@@ -344,7 +344,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
if (!isMultiJvm())
info("All affinity nodes: " + affinityNodes());
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
info("Cache affinity nodes: " + affinity(cache).mapKeyToPrimaryAndBackups(key));
@@ -412,9 +412,9 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
/** {@inheritDoc} */
@Override public void run(int idx) throws Exception {
- assertEquals(0, ((IgniteKernal)ignite).<String, Integer>internalCache().context().tm().idMapSize());
+ assertEquals(0, ((IgniteKernal)ignite).<String, Integer>internalCache(DEFAULT_CACHE_NAME).context().tm().idMapSize());
- IgniteCache<Object, Object> cache = ignite.cache(null);
+ IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
ClusterNode node = ((IgniteKernal)ignite).localNode();
for (int k = 0; k < size; k++) {
@@ -431,7 +431,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
private static class IsNearTask extends TestIgniteIdxRunnable {
/** {@inheritDoc} */
@Override public void run(int idx) throws Exception {
- assertTrue(((IgniteKernal)ignite).internalCache().context().isNear());
+ assertTrue(((IgniteKernal)ignite).internalCache(DEFAULT_CACHE_NAME).context().isNear());
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
index 86b2217..8fc41ce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
@@ -112,12 +112,12 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
super.afterTest();
if (GRID_CNT > 0)
- grid(0).cache(null).removeAll();
+ grid(0).cache(DEFAULT_CACHE_NAME).removeAll();
for (int i = 0; i < GRID_CNT; i++) {
- grid(i).cache(null).clear();
+ grid(i).cache(DEFAULT_CACHE_NAME).clear();
- assert grid(i).cache(null).localSize() == 0;
+ assert grid(i).cache(DEFAULT_CACHE_NAME).localSize() == 0;
}
}
@@ -188,7 +188,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
multithreaded(new CAX() {
@SuppressWarnings({"BusyWait"})
@Override public void applyx() {
- IgniteCache<Integer, Integer> c = grid(0).cache(null);
+ IgniteCache<Integer, Integer> c = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < TX_CNT; i++) {
int kv = cntr.incrementAndGet();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
index 32d5bfb..96d4603 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
@@ -95,9 +95,9 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- cache1 = startGrid(1).cache(null);
- cache2 = startGrid(2).cache(null);
- cache3 = startGrid(3).cache(null);
+ cache1 = startGrid(1).cache(DEFAULT_CACHE_NAME);
+ cache2 = startGrid(2).cache(DEFAULT_CACHE_NAME);
+ cache3 = startGrid(3).cache(DEFAULT_CACHE_NAME);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index 9cc3988..06fbe8f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -203,7 +203,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
private void startTxAndPutKeys(final TransactionConcurrency mode, final boolean prepare) throws Exception {
Ignite ignite = grid(0);
- final Collection<Integer> keys = nearKeys(ignite.cache(null), KEY_CNT, 0);
+ final Collection<Integer> keys = nearKeys(ignite.cache(DEFAULT_CACHE_NAME), KEY_CNT, 0);
IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() {
@Override public void run() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
index cad13ca..14a0c0f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
@@ -54,7 +54,7 @@ public class GridCachePutArrayValueSelfTest extends GridCacheAbstractSelfTest {
public void testInternalKeys() throws Exception {
assert gridCount() >= 2;
- IgniteCache<InternalKey, Object> jcache = grid(0).cache(null);
+ IgniteCache<InternalKey, Object> jcache = grid(0).cache(DEFAULT_CACHE_NAME);
final InternalKey key = new InternalKey(0); // Hangs on the first remote put.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
index 3fe2cd7..51c2fc2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
@@ -80,7 +80,7 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac
Map<Integer, Collection<UUID>> mapping = new HashMap<>();
for (int i = 0; i < 4; i++) {
- IgniteCache<Object, Object> cache = grid(i).cache(null);
+ IgniteCache<Object, Object> cache = grid(i).cache(DEFAULT_CACHE_NAME);
Affinity<Object> aff = affinity(cache);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
index d35f2ffc..23b0e18 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
@@ -103,14 +103,14 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testBackupLoad() throws Exception {
- grid(0).cache(null).put(1, 1);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(1, 1);
assert store.get(1) == 1;
for (int i = 0; i < GRID_CNT; i++) {
IgniteCache<Integer, Integer> cache = jcache(i);
- if (grid(i).affinity(null).isBackup(grid(i).localNode(), 1)) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isBackup(grid(i).localNode(), 1)) {
assert cache.localPeek(1) == 1;
jcache(i).localClear(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
index 9ea7446..ca12a99 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
@@ -83,14 +81,14 @@ public class IgniteCacheNearOnlyTxTest extends IgniteCacheAbstractTest {
assertTrue(ignite1.configuration().isClientMode());
- ignite1.createNearCache(null, new NearCacheConfiguration<>());
+ ignite1.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<>());
final Integer key = 1;
final AtomicInteger idx = new AtomicInteger();
- IgniteCache<Integer, Integer> cache0 = ignite(0).cache(null);
- IgniteCache<Integer, Integer> cache1 = ignite1.cache(null);
+ IgniteCache<Integer, Integer> cache0 = ignite(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, Integer> cache1 = ignite1.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 5; i++) {
log.info("Iteration: " + i);
@@ -99,7 +97,7 @@ public class IgniteCacheNearOnlyTxTest extends IgniteCacheAbstractTest {
@Override public Object call() throws Exception {
int val = idx.getAndIncrement();
- IgniteCache<Integer, Integer> cache = ignite1.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite1.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++)
cache.put(key, val);
@@ -135,21 +133,21 @@ public class IgniteCacheNearOnlyTxTest extends IgniteCacheAbstractTest {
assertTrue(ignite1.configuration().isClientMode());
- ignite1.createNearCache(null, new NearCacheConfiguration<>());
+ ignite1.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<>());
final AtomicInteger idx = new AtomicInteger();
final Integer key = 1;
- IgniteCache<Integer, Integer> cache0 = ignite(0).cache(null);
- IgniteCache<Integer, Integer> cache1 = ignite1.cache(null);
+ IgniteCache<Integer, Integer> cache0 = ignite(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, Integer> cache1 = ignite1.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 5; i++) {
log.info("Iteration: " + i);
GridTestUtils.runMultiThreaded(new Callable<Object>() {
@Override public Object call() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite1.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite1.cache(DEFAULT_CACHE_NAME);
IgniteTransactions txs = ignite1.transactions();
@@ -181,13 +179,13 @@ public class IgniteCacheNearOnlyTxTest extends IgniteCacheAbstractTest {
assertTrue(ignite1.configuration().isClientMode());
- ignite1.createNearCache(null, new NearCacheConfiguration<>());
+ ignite1.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<>());
final Integer key = 1;
IgniteInternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite1.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite1.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++)
cache.put(key, 1);
@@ -198,7 +196,7 @@ public class IgniteCacheNearOnlyTxTest extends IgniteCacheAbstractTest {
IgniteInternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite1.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite1.cache(DEFAULT_CACHE_NAME);
IgniteTransactions txs = ignite1.transactions();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
index d7ab309..ad9bce0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java
@@ -52,7 +52,7 @@ public class IgniteCacheNearReadCommittedTest extends GridCacheAbstractSelfTest
* @throws Exception If failed.
*/
public void testReadCommittedCacheCleanup() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite(0).cache(null);
+ IgniteCache<Integer, Integer> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
Integer key = backupKey(cache);
@@ -66,7 +66,7 @@ public class IgniteCacheNearReadCommittedTest extends GridCacheAbstractSelfTest
tx.commit();
}
- ignite(1).cache(null).remove(key); // Remove from primary node.
+ ignite(1).cache(DEFAULT_CACHE_NAME).remove(key); // Remove from primary node.
assertEquals(0, cache.localSize(CachePeekMode.ALL));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
index 0820370..7cfe690 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
@@ -43,7 +43,7 @@ public class IgniteTxReentryNearSelfTest extends IgniteTxReentryAbstractSelfTest
@Override protected int testKey() {
int key = 0;
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
while (true) {
Collection<ClusterNode> nodes = affinity(cache).mapKeyToPrimaryAndBackups(key);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
index 8f26c6e..4e4aa58 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
@@ -117,7 +117,7 @@ public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest {
private void updateMultithreaded(CacheAtomicityMode atomicityMode, boolean restart) throws Exception {
Ignite srv = ignite(0);
- srv.destroyCache(null);
+ srv.destroyCache(DEFAULT_CACHE_NAME);
IgniteCache<Integer, Integer> srvCache = srv.createCache(cacheConfiguration(atomicityMode));
@@ -126,14 +126,14 @@ public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest {
assertTrue(client.configuration().isClientMode());
final IgniteCache<Integer, Integer> clientCache =
- client.createNearCache(null, new NearCacheConfiguration<Integer, Integer>());
+ client.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<Integer, Integer>());
final AtomicBoolean stop = new AtomicBoolean();
IgniteInternalFuture<?> restartFut = null;
// Primary key for restarted node.
- final Integer key0 = primaryKey(ignite(SRV_CNT - 1).cache(null));
+ final Integer key0 = primaryKey(ignite(SRV_CNT - 1).cache(DEFAULT_CACHE_NAME));
if (restart) {
restartFut = GridTestUtils.runAsync(new Callable<Void>() {
@@ -206,7 +206,7 @@ public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest {
* @return Cache configuration.
*/
private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode) {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(atomicityMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java
index 2283560..ca60060 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java
@@ -95,11 +95,11 @@ public class NearCachePutAllMultinodeTest extends GridCommonAbstractTest {
Ignite grid = startGrid(GRID_CNT - 2);
- grid.createNearCache(null, new NearCacheConfiguration());
+ grid.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration());
grid = startGrid(GRID_CNT - 1);
- grid.cache(null);
+ grid.cache(DEFAULT_CACHE_NAME);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
index 359b12b..d253013 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
@@ -130,7 +130,7 @@ public class NearCacheSyncUpdateTest extends GridCommonAbstractTest {
}, 10, "update-thread");
}
finally {
- ignite(0).destroyCache(null);
+ ignite(0).destroyCache(DEFAULT_CACHE_NAME);
}
}
@@ -139,7 +139,7 @@ public class NearCacheSyncUpdateTest extends GridCommonAbstractTest {
* @return Cache configuration.
*/
private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode) {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(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/distributed/near/NoneRebalanceModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
index 4d6586a..f3fb814 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
@@ -58,11 +58,11 @@ public class NoneRebalanceModeSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testRemoveAll() throws Exception {
- GridNearTransactionalCache cache = (GridNearTransactionalCache)((IgniteKernal)grid(0)).internalCache(null);
+ GridNearTransactionalCache cache = (GridNearTransactionalCache)((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME);
for (GridDhtLocalPartition part : cache.dht().topology().localPartitions())
assertEquals(OWNING, part.state());
- grid(0).cache(null).removeAll();
+ grid(0).cache(DEFAULT_CACHE_NAME).removeAll();
}
}
\ 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/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java
index db7875f..dc141db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java
@@ -45,9 +45,6 @@ public class GridCacheRabalancingDelayedPartitionMapExchangeSelfTest extends Gri
/** */
protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
- /** partitioned cache name. */
- protected static String CACHE = null;
-
/** */
private final ConcurrentHashMap8<UUID, Runnable> rs = new ConcurrentHashMap8<>();
@@ -102,9 +99,8 @@ public class GridCacheRabalancingDelayedPartitionMapExchangeSelfTest extends Gri
public void test() throws Exception {
IgniteKernal ignite = (IgniteKernal)startGrid(0);
- CacheConfiguration<Integer, Integer> cfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
- cfg.setName(CACHE);
cfg.setCacheMode(CacheMode.PARTITIONED);
cfg.setRebalanceMode(CacheRebalanceMode.SYNC);
cfg.setBackups(1);
@@ -142,7 +138,7 @@ public class GridCacheRabalancingDelayedPartitionMapExchangeSelfTest extends Gri
U.sleep(10);
}
- ignite(0).destroyCache(CACHE);
+ ignite(0).destroyCache(DEFAULT_CACHE_NAME);
ignite(0).getOrCreateCache(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
index 64ec3ec..d8a7605 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
@@ -151,7 +151,7 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
* @see #getConfiguration().
*/
protected CacheConfiguration<IntegerKey, Integer> getCacheConfiguration() {
- CacheConfiguration<IntegerKey, Integer> cfg = new CacheConfiguration<>();
+ CacheConfiguration<IntegerKey, Integer> cfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cfg.setAtomicityMode(TRANSACTIONAL ? CacheAtomicityMode.TRANSACTIONAL : CacheAtomicityMode.ATOMIC);
cfg.setCacheMode(CacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
index 1e0b390..d842e84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
@@ -45,7 +45,7 @@ public class GridCacheRebalancingSyncCheckDataTest extends GridCommonAbstractTes
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(REPLICATED);
ccfg.setRebalanceMode(SYNC);
@@ -70,7 +70,7 @@ public class GridCacheRebalancingSyncCheckDataTest extends GridCommonAbstractTes
final int KEYS = 10_000;
- IgniteCache<Object, Object> cache = ignite.cache(null);
+ IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < KEYS; i++)
cache.put(i, i);
@@ -84,7 +84,7 @@ public class GridCacheRebalancingSyncCheckDataTest extends GridCommonAbstractTes
GridTestUtils.runMultiThreaded(new Callable<Void>() {
@Override public Void call() throws Exception {
try(Ignite ignite = startGrid(idx.getAndIncrement())) {
- IgniteCache<Object, Object> cache = ignite.cache(null);
+ IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < KEYS; i++)
assertNotNull(cache.localPeek(i));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
index a9df85c..f6667f3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
@@ -112,7 +112,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
if (getTestIgniteInstanceName(10).equals(igniteInstanceName))
iCfg.setClientMode(true);
- CacheConfiguration<Integer, Integer> cachePCfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cachePCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cachePCfg.setName(CACHE_NAME_DHT_PARTITIONED);
cachePCfg.setCacheMode(CacheMode.PARTITIONED);
@@ -122,7 +122,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
cachePCfg.setRebalanceBatchesPrefetchCount(1);
cachePCfg.setRebalanceOrder(2);
- CacheConfiguration<Integer, Integer> cachePCfg2 = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cachePCfg2 = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cachePCfg2.setName(CACHE_NAME_DHT_PARTITIONED_2);
cachePCfg2.setCacheMode(CacheMode.PARTITIONED);
@@ -131,7 +131,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
cachePCfg2.setRebalanceOrder(2);
//cachePCfg2.setRebalanceDelay(5000);//Known issue, possible deadlock in case of low priority cache rebalancing delayed.
- CacheConfiguration<Integer, Integer> cacheRCfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cacheRCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cacheRCfg.setName(CACHE_NAME_DHT_REPLICATED);
cacheRCfg.setCacheMode(CacheMode.REPLICATED);
@@ -140,7 +140,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
cacheRCfg.setRebalanceBatchesPrefetchCount(Integer.MAX_VALUE);
((TcpCommunicationSpi)iCfg.getCommunicationSpi()).setSharedMemoryPort(-1);//Shmem fail fix for Integer.MAX_VALUE.
- CacheConfiguration<Integer, Integer> cacheRCfg2 = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cacheRCfg2 = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cacheRCfg2.setName(CACHE_NAME_DHT_REPLICATED_2);
cacheRCfg2.setCacheMode(CacheMode.REPLICATED);
@@ -502,7 +502,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
waitForRebalancing(4, 5, 0);
//New cache should start rebalancing.
- CacheConfiguration<Integer, Integer> cacheRCfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cacheRCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cacheRCfg.setName(CACHE_NAME_DHT_PARTITIONED + "_NEW");
cacheRCfg.setCacheMode(CacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingUnmarshallingFailedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingUnmarshallingFailedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingUnmarshallingFailedSelfTest.java
index d745dcd..6d72a52 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingUnmarshallingFailedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingUnmarshallingFailedSelfTest.java
@@ -103,7 +103,7 @@ public class GridCacheRebalancingUnmarshallingFailedSelfTest extends GridCommonA
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration iCfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration<TestKey, Integer> cfg = new CacheConfiguration<>();
+ CacheConfiguration<TestKey, Integer> cfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cfg.setName(CACHE);
cfg.setCacheMode(CacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
index b4e58fc..9fd2f29 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
@@ -41,7 +41,7 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends
/** {@inheritDoc} */
@Override protected CacheConfiguration cacheConfiguration0() {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setCacheMode(REPLICATED);
cfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
index dd1e73b..e55a434 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
@@ -94,17 +94,17 @@ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTe
Ignite g1 = startGrid(1);
for (int i = 0; i < keyCnt; i++)
- g0.cache(null).put(i, i);
+ g0.cache(DEFAULT_CACHE_NAME).put(i, i);
- assertEquals(keyCnt, ((IgniteKernal)g0).internalCache(null).size());
- assertEquals(keyCnt, ((IgniteKernal)g1).internalCache(null).size());
+ assertEquals(keyCnt, ((IgniteKernal)g0).internalCache(DEFAULT_CACHE_NAME).size());
+ assertEquals(keyCnt, ((IgniteKernal)g1).internalCache(DEFAULT_CACHE_NAME).size());
for (int n = 0; n < retries; n++) {
info("Starting additional grid node...");
Ignite g2 = startGrid(2);
- assertEquals(keyCnt, ((IgniteKernal)g2).internalCache(null).size());
+ assertEquals(keyCnt, ((IgniteKernal)g2).internalCache(DEFAULT_CACHE_NAME).size());
info("Stopping additional grid node...");
@@ -125,10 +125,10 @@ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTe
Ignite g1 = startGrid(1);
for (int i = 0; i < keyCnt; i++)
- g0.cache(null).put(i, i);
+ g0.cache(DEFAULT_CACHE_NAME).put(i, i);
- assertEquals(keyCnt, ((IgniteKernal)g0).internalCache(null).size());
- assertEquals(keyCnt, ((IgniteKernal)g1).internalCache(null).size());
+ assertEquals(keyCnt, ((IgniteKernal)g0).internalCache(DEFAULT_CACHE_NAME).size());
+ assertEquals(keyCnt, ((IgniteKernal)g1).internalCache(DEFAULT_CACHE_NAME).size());
final AtomicInteger cnt = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 7f4f2fa..346f908 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -240,7 +240,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
try {
Ignite g1 = startGrid(1);
- GridCacheAdapter<Integer, String> cache1 = ((IgniteKernal)g1).internalCache(null);
+ GridCacheAdapter<Integer, String> cache1 = ((IgniteKernal)g1).internalCache(DEFAULT_CACHE_NAME);
cache1.getAndPut(1, "val1");
cache1.getAndPut(2, "val2");
@@ -275,12 +275,12 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
assertEquals(EVT_CACHE_REBALANCE_STARTED, iter.next().type());
assertEquals(EVT_CACHE_REBALANCE_STOPPED, iter.next().type());
- IgniteCache<Integer, String> cache2 = g2.cache(null);
+ IgniteCache<Integer, String> cache2 = g2.cache(DEFAULT_CACHE_NAME);
assertEquals("val1", cache2.localPeek(1));
assertEquals("val2", cache2.localPeek(2));
- GridCacheAdapter<Integer, String> cacheAdapter2 = ((IgniteKernal)g2).internalCache(null);
+ GridCacheAdapter<Integer, String> cacheAdapter2 = ((IgniteKernal)g2).internalCache(DEFAULT_CACHE_NAME);
GridCacheEntryEx e2 = cacheAdapter2.entryEx(1);
@@ -312,8 +312,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
Ignite g1 = startGrid(1);
Ignite g2 = startGrid(2);
- IgniteCache<Integer, Object> cache1 = g1.cache(null);
- IgniteCache<Integer, Object> cache2 = g2.cache(null);
+ IgniteCache<Integer, Object> cache1 = g1.cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, Object> cache2 = g2.cache(DEFAULT_CACHE_NAME);
ClassLoader ldr = grid(1).configuration().getClassLoader();
@@ -357,7 +357,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
Ignite g3 = startGrid(3);
- IgniteCache<Integer, Object> cache3 = g3.cache(null);
+ IgniteCache<Integer, Object> cache3 = g3.cache(DEFAULT_CACHE_NAME);
Object v3 = cache3.localPeek(1, CachePeekMode.ONHEAP);
@@ -392,9 +392,9 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
Ignite g3 = startGrid(3);
- IgniteCache<Integer, Object> cache1 = g1.cache(null);
- IgniteCache<Integer, Object> cache2 = g2.cache(null);
- IgniteCache<Integer, Object> cache3 = g3.cache(null);
+ IgniteCache<Integer, Object> cache1 = g1.cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, Object> cache2 = g2.cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, Object> cache3 = g3.cache(DEFAULT_CACHE_NAME);
final Class<CacheEntryListener> cls1 = (Class<CacheEntryListener>) getExternalClassLoader().
loadClass("org.apache.ignite.tests.p2p.CacheDeploymentCacheEntryListener");
@@ -601,7 +601,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
g1.events().remoteListen(null, (IgnitePredicate)cls2.newInstance(), EVT_CACHE_OBJECT_PUT);
g1.events().remoteListen(null, new EventListener(), EVT_CACHE_OBJECT_PUT);
- g1.cache(null).put("1", cls.newInstance());
+ g1.cache(DEFAULT_CACHE_NAME).put("1", cls.newInstance());
latch.await();
}
@@ -622,14 +622,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
batchSize = 512;
try {
- IgniteCache<Integer, String> cache1 = startGrid(1).cache(null);
+ IgniteCache<Integer, String> cache1 = startGrid(1).cache(DEFAULT_CACHE_NAME);
int keyCnt = 1000;
for (int i = 0; i < keyCnt; i++)
cache1.put(i, "val" + i);
- IgniteCache<Integer, String> cache2 = startGrid(2).cache(null);
+ IgniteCache<Integer, String> cache2 = startGrid(2).cache(DEFAULT_CACHE_NAME);
assertEquals(keyCnt, cache2.localSize(CachePeekMode.ALL));
}
@@ -646,14 +646,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
batchSize = 256;
try {
- IgniteCache<Integer, String> cache1 = startGrid(1).cache(null);
+ IgniteCache<Integer, String> cache1 = startGrid(1).cache(DEFAULT_CACHE_NAME);
int keyCnt = 2000;
for (int i = 0; i < keyCnt; i++)
cache1.put(i, "val" + i);
- IgniteCache<Integer, String> cache2 = startGrid(2).cache(null);
+ IgniteCache<Integer, String> cache2 = startGrid(2).cache(DEFAULT_CACHE_NAME);
int size = cache2.localSize(CachePeekMode.ALL);
@@ -701,14 +701,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
batchSize = 1; // 1 byte but one entry should be in batch anyway.
try {
- IgniteCache<Integer, String> cache1 = startGrid(1).cache(null);
+ IgniteCache<Integer, String> cache1 = startGrid(1).cache(DEFAULT_CACHE_NAME);
int cnt = 100;
for (int i = 0; i < cnt; i++)
cache1.put(i, "val" + i);
- IgniteCache<Integer, String> cache2 = startGrid(2).cache(null);
+ IgniteCache<Integer, String> cache2 = startGrid(2).cache(DEFAULT_CACHE_NAME);
assertEquals(cnt, cache2.localSize(CachePeekMode.ALL));
}
@@ -725,14 +725,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
batchSize = 1000; // 1000 bytes.
try {
- IgniteCache<Integer, String> cache1 = startGrid(1).cache(null);
+ IgniteCache<Integer, String> cache1 = startGrid(1).cache(DEFAULT_CACHE_NAME);
int cnt = 100;
for (int i = 0; i < cnt; i++)
cache1.put(i, "val" + i);
- IgniteCache<Integer, String> cache2 = startGrid(2).cache(null);
+ IgniteCache<Integer, String> cache2 = startGrid(2).cache(DEFAULT_CACHE_NAME);
assertEquals(cnt, cache2.localSize(CachePeekMode.ALL));
}
@@ -749,14 +749,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
batchSize = 10000; // 10000 bytes.
try {
- IgniteCache<Integer, String> cache1 = startGrid(1).cache(null);
+ IgniteCache<Integer, String> cache1 = startGrid(1).cache(DEFAULT_CACHE_NAME);
int cnt = 100;
for (int i = 0; i < cnt; i++)
cache1.put(i, "val" + i);
- IgniteCache<Integer, String> cache2 = startGrid(2).cache(null);
+ IgniteCache<Integer, String> cache2 = startGrid(2).cache(DEFAULT_CACHE_NAME);
assertEquals(cnt, cache2.localSize(CachePeekMode.ALL));
}
@@ -787,7 +787,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < cnt; i++) {
if (i % 100 == 0) {
if (map != null && !map.isEmpty()) {
- grid(0).cache(null).putAll(map);
+ grid(0).cache(DEFAULT_CACHE_NAME).putAll(map);
info("Put entries count: " + i);
}
@@ -799,16 +799,16 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
}
if (map != null && !map.isEmpty())
- grid(0).cache(null).putAll(map);
+ grid(0).cache(DEFAULT_CACHE_NAME).putAll(map);
for (int gridIdx = 0; gridIdx < gridCnt; gridIdx++) {
- assert grid(gridIdx).cache(null).localSize(CachePeekMode.ALL) == cnt :
- "Actual size: " + grid(gridIdx).cache(null).localSize(CachePeekMode.ALL);
+ assert grid(gridIdx).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.ALL) == cnt :
+ "Actual size: " + grid(gridIdx).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.ALL);
info("Cache size is OK for grid index: " + gridIdx);
}
- IgniteCache<Integer, String> lastCache = startGrid(gridCnt).cache(null);
+ IgniteCache<Integer, String> lastCache = startGrid(gridCnt).cache(DEFAULT_CACHE_NAME);
// Let preloading start.
Thread.sleep(1000);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
index 2073d68..07c50d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
@@ -52,7 +52,7 @@ public class GridCacheReplicatedPreloadStartStopEventsSelfTest extends GridCommo
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
index b6fcebc..abb553d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
@@ -481,7 +481,7 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
try {
Ignite ignite = startGrid();
- IgniteCache<Object, Object> cache = ignite.cache(null);
+ IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
int cnt = 500;
@@ -596,7 +596,7 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
/** @return Policy. */
@SuppressWarnings({"unchecked"})
protected T policy() {
- return (T)grid().cache(null).getConfiguration(CacheConfiguration.class).getEvictionPolicy();
+ return (T)grid().cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class).getEvictionPolicy();
}
/**
@@ -605,7 +605,7 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
*/
@SuppressWarnings({"unchecked"})
protected T policy(int i) {
- return (T)grid(i).cache(null).getConfiguration(CacheConfiguration.class).getEvictionPolicy();
+ return (T)grid(i).cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class).getEvictionPolicy();
}
/**
@@ -614,7 +614,7 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
*/
@SuppressWarnings({"unchecked"})
protected T nearPolicy(int i) {
- CacheConfiguration cfg = grid(i).cache(null).getConfiguration(CacheConfiguration.class);
+ CacheConfiguration cfg = grid(i).cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class);
NearCacheConfiguration nearCfg = cfg.getNearConfiguration();
@@ -745,7 +745,7 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
int cnt = 500;
for (int i = 0; i < cnt; i++) {
- IgniteCache<Integer, String> cache = grid(rand.nextInt(2)).cache(null);
+ IgniteCache<Integer, String> cache = grid(rand.nextInt(2)).cache(DEFAULT_CACHE_NAME);
int key = rand.nextInt(100);
String val = Integer.toString(key);
@@ -814,7 +814,7 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
for (int i = 0; i < cnt && !Thread.currentThread().isInterrupted(); i++) {
IgniteEx grid = grid(rand.nextInt(2));
- IgniteCache<Integer, String> cache = grid.cache(null);
+ IgniteCache<Integer, String> cache = grid.cache(DEFAULT_CACHE_NAME);
int key = rand.nextInt(1000);
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/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
index e61bef6..5ff0be2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
@@ -238,7 +238,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
try {
final Ignite ignite = startGrid(1);
- final IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ final IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
long start = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
index 31d7c26..45d98bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
@@ -150,7 +150,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
try {
Ignite ignite = startGrid(1);
- final IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ final IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
// Warm up.
for (int i = 0; i < warmUpPutsCnt; i++) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
index c97f2ca..f28e56b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
@@ -174,7 +174,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
Ignite g = startGrids();
- IgniteCache<String, String> cache = g.cache(null);
+ IgniteCache<String, String> cache = g.cache(DEFAULT_CACHE_NAME);
try {
info(">>> Checking policy [txConcurrency=" + txConcurrency + ", txIsolation=" + txIsolation +
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index eb675ad..b432c2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@ -143,7 +143,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
try {
Ignite g = grid(0);
- IgniteCache<Object, Object> c = g.cache(null);
+ IgniteCache<Object, Object> c = g.cache(DEFAULT_CACHE_NAME);
int cnt = 1;
@@ -198,7 +198,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
Ignite g = startGrid();
- IgniteCache<Object, Object> cache = g.cache(null);
+ IgniteCache<Object, Object> cache = g.cache(DEFAULT_CACHE_NAME);
try {
int id = 1;