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:22 UTC
[20/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/GridCacheMissingCommitVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
index f3d2434..a6f2022 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
@@ -65,7 +65,7 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes
cfg.setDiscoverySpi(discoSpi);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
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/GridCacheMixedPartitionExchangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
index 91a1e67..f6f4751 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
@@ -105,7 +105,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT
int key = rnd.nextInt(keys);
- IgniteCache<Integer, Integer> prj = grid(g).cache(null);
+ IgniteCache<Integer, Integer> prj = grid(g).cache(DEFAULT_CACHE_NAME);
try {
try (Transaction tx = grid(g).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
@@ -157,7 +157,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT
for (int i = 0; i < 4; i++) {
IgniteKernal grid = (IgniteKernal)grid(i);
- GridCacheContext<Object, Object> cctx = grid.internalCache(null).context();
+ GridCacheContext<Object, Object> cctx = grid.internalCache(DEFAULT_CACHE_NAME).context();
IgniteInternalFuture<AffinityTopologyVersion> verFut = cctx.affinity().affinityReadyFuture(topVer);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
index 9cff139..367d8ac 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
@@ -112,7 +112,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest {
try {
IgniteKernal g = (IgniteKernal)grid(0);
- GridCacheContext<Object, Object> cctx = g.internalCache().context();
+ GridCacheContext<Object, Object> cctx = g.internalCache(DEFAULT_CACHE_NAME).context();
GridDhtCacheAdapter cache = nearEnabled ? cctx.near().dht() : cctx.colocated();
@@ -133,7 +133,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest {
started.set(true);
- IgniteCache<Object, Object> c = g4.cache(null);
+ IgniteCache<Object, Object> c = g4.cache(DEFAULT_CACHE_NAME);
info(">>>> Checking tx in new grid.");
@@ -154,7 +154,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest {
assertFalse(started.get());
// Check we can proceed with transactions.
- IgniteCache<Object, Object> cache0 = g.cache(null);
+ IgniteCache<Object, Object> cache0 = g.cache(DEFAULT_CACHE_NAME);
info(">>>> Checking tx commit.");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
index e11afb2..800f4ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
@@ -75,7 +75,7 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache
* @throws Exception If failed.
*/
public void testInvoke() throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
final Integer key = primaryKey(cache);
@@ -95,7 +95,7 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache
@Override public Void call() throws Exception {
int idx = gridIdx.incrementAndGet() - 1;
- final IgniteCache<Integer, Integer> cache = grid(idx).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(idx).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++)
cache.invoke(key, new IncProcessor());
@@ -109,7 +109,7 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache
expVal += ITERATIONS_PER_THREAD * THREADS;
for (int j = 0; j < gridCount(); j++) {
- Integer val = (Integer)grid(j).cache(null).get(key);
+ Integer val = (Integer)grid(j).cache(DEFAULT_CACHE_NAME).get(key);
assertEquals("Unexpected value for grid " + j, expVal, val);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
index 827b0a5..c6b797a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
@@ -67,7 +67,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
*
*/
public void testAllTrueFlags() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -108,7 +108,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
*
*/
public void testAllFalseFlags() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
index 957828c..993a1cf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
@@ -101,7 +101,7 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest {
try {
Ignite ignite = startGridsMultiThreaded(gridCnt);
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
Transaction tx = ignite.transactions().txStart();
@@ -110,8 +110,8 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest {
tx.commit();
for (int i = 0; i < gridCnt; i++) {
- assert ((IgniteKernal)grid(i)).internalCache().context().mvcc().localCandidates().isEmpty();
- assert ((IgniteKernal)grid(i)).internalCache().context().mvcc().remoteCandidates().isEmpty();
+ assert ((IgniteKernal)grid(i)).internalCache(DEFAULT_CACHE_NAME).context().mvcc().localCandidates().isEmpty();
+ assert ((IgniteKernal)grid(i)).internalCache(DEFAULT_CACHE_NAME).context().mvcc().remoteCandidates().isEmpty();
}
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
index 0c53fee..119002c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
@@ -89,7 +89,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* Tests remote candidates.
*/
public void testNearLocalsWithPending() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -123,7 +123,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* Tests remote candidates.
*/
public void testNearLocalsWithCommitted() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -156,7 +156,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* Tests remote candidates.
*/
public void testNearLocalsWithRolledback() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -189,7 +189,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* Tests remote candidates.
*/
public void testNearLocals() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -219,7 +219,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* Tests remote candidates.
*/
public void testNearLocalsWithOwned() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -258,7 +258,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAddPendingRemote0() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -290,7 +290,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAddPendingRemote1() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -333,7 +333,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAddPendingRemote2() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -377,7 +377,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* Tests salvageRemote method
*/
public void testSalvageRemote() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -435,7 +435,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearRemoteConsistentOrdering0() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -473,7 +473,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearRemoteConsistentOrdering1() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -518,7 +518,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearRemoteConsistentOrdering2() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -563,7 +563,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearRemoteConsistentOrdering3() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -602,7 +602,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testSerializableReadLocksAdd() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheVersion serOrder1 = new GridCacheVersion(0, 10, 1);
GridCacheVersion serOrder2 = new GridCacheVersion(0, 20, 1);
@@ -679,7 +679,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testSerializableReadLocksAssign() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheVersion serOrder1 = new GridCacheVersion(0, 10, 1);
GridCacheVersion serOrder2 = new GridCacheVersion(0, 20, 1);
@@ -829,7 +829,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void checkNonSerializableConflict() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
UUID nodeId = UUID.randomUUID();
@@ -875,7 +875,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void checkSerializableAdd(boolean incVer) throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
UUID nodeId = UUID.randomUUID();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
index e15a20f..6f52cce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
@@ -84,7 +84,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testMarshalUnmarshalCandidate() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx parent = new GridCacheTestEntryEx(cache.context(), "1");
@@ -116,7 +116,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* Tests remote candidates.
*/
public void testRemotes() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -267,7 +267,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* Tests that orderOwned does not reorder owned locks.
*/
public void testNearRemoteWithOwned() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -309,7 +309,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* Tests that orderOwned does not reorder owned locks.
*/
public void testNearRemoteWithOwned1() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -355,7 +355,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* Tests that orderOwned does not reorder owned locks.
*/
public void testNearRemoteWithOwned2() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -403,7 +403,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* Tests remote candidates.
*/
public void testLocal() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -477,7 +477,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* Tests assignment of local candidates when remote exist.
*/
public void testLocalWithRemote() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -513,7 +513,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithBaseInTheMiddle() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -566,7 +566,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithCompletedBaseInTheMiddle() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -608,7 +608,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedTwiceWithBaseInTheMiddle() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -654,7 +654,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithBaseInTheMiddleNoChange() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -693,7 +693,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithBaseInTheBeginning() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -735,7 +735,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* This case should never happen, nevertheless we need to test for it.
*/
public void testCompletedWithBaseInTheBeginningNoChange() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -774,7 +774,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* This case should never happen, nevertheless we need to test for it.
*/
public void testCompletedWithBaseInTheEndNoChange() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -813,7 +813,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithBaseNotPresentInTheMiddle() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -854,7 +854,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithBaseNotPresentInTheMiddleNoChange() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -889,7 +889,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithBaseNotPresentInTheBeginning() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -930,7 +930,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithBaseNotPresentInTheBeginningNoChange() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -971,7 +971,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*
*/
public void testCompletedWithBaseNotPresentInTheEndNoChange() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -1008,7 +1008,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* Test local and remote candidates together.
*/
public void testLocalAndRemote() {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1");
@@ -1136,7 +1136,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
public void testMultipleLocalAndRemoteLocks1() throws Exception {
UUID nodeId = UUID.randomUUID();
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheContext<String, String> ctx = cache.context();
@@ -1207,7 +1207,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* @throws Exception If test failed.
*/
public void testMultipleLocalAndRemoteLocks2() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheContext<String, String> ctx = cache.context();
@@ -1294,7 +1294,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* @throws Exception If test failed.
*/
public void testMultipleLocalLocks() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheContext<String, String> ctx = cache.context();
@@ -1335,7 +1335,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
*/
@SuppressWarnings({"ObjectEquality"})
public void testUsedCandidates() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheContext<String, String> ctx = cache.context();
@@ -1402,7 +1402,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
public void testReverseOrder1() {
UUID id = UUID.randomUUID();
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheContext<String, String> ctx = cache.context();
@@ -1455,7 +1455,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
public void testReverseOrder2() throws Exception {
UUID id = UUID.randomUUID();
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheContext<String, String> ctx = cache.context();
@@ -1515,7 +1515,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testReverseOrder3() throws Exception {
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheContext<String, String> ctx = cache.context();
@@ -1565,7 +1565,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
public void testReverseOrder4() throws Exception {
UUID id = UUID.randomUUID();
- GridCacheAdapter<String, String> cache = grid.internalCache();
+ GridCacheAdapter<String, String> cache = grid.internalCache(DEFAULT_CACHE_NAME);
GridCacheContext<String, String> ctx = cache.context();
@@ -1634,7 +1634,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
multithreaded(new Runnable() {
@Override public void run() {
for (GridCacheMvccCandidate cand : cands) {
- boolean b = grid.<String, String>internalCache().context().mvcc().addNext(ctx, cand);
+ boolean b = grid.<String, String>internalCache(DEFAULT_CACHE_NAME).context().mvcc().addNext(ctx, cand);
assert b;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
index 3bee4d7..e93fd1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
@@ -91,9 +91,9 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest {
super.afterTest();
for (int i = 0; i < GRID_CNT; i++) {
- grid(i).cache(null).removeAll();
+ grid(i).cache(DEFAULT_CACHE_NAME).removeAll();
- assert grid(i).cache(null).localSize() == 0;
+ assert grid(i).cache(DEFAULT_CACHE_NAME).localSize() == 0;
}
}
@@ -111,7 +111,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testTwoTx() throws Exception {
- final IgniteCache<String, Integer> c = grid(0).cache(null);
+ final IgniteCache<String, Integer> c = grid(0).cache(DEFAULT_CACHE_NAME);
GridKernalContext ctx = ((IgniteKernal)grid(0)).context();
@@ -142,7 +142,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLockAndTx() throws Exception {
- final IgniteCache<String, Integer> c = grid(0).cache(null);
+ final IgniteCache<String, Integer> c = grid(0).cache(DEFAULT_CACHE_NAME);
Collection<Thread> threads = new LinkedList<>();
@@ -218,9 +218,9 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLockAndTx1() throws Exception {
- final IgniteCache<String, Integer> c = grid(0).cache(null);
+ final IgniteCache<String, Integer> c = grid(0).cache(DEFAULT_CACHE_NAME);
- final IgniteCache<Integer, Integer> c1 = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> c1 = grid(0).cache(DEFAULT_CACHE_NAME);
Collection<Thread> threads = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
index 54a3aa9..33b7033 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
@@ -157,13 +157,13 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest {
Ignite g = startGrid(0);
try {
- IgniteCache<Object, Object> cache = g.cache(null);
+ IgniteCache<Object, Object> cache = g.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 10; i++)
cache.put(i, i);
for (int i = 0; i < 10; i++) {
- GridCacheEntryEx entry = ((IgniteKernal)g).context().cache().internalCache().peekEx(i);
+ GridCacheEntryEx entry = ((IgniteKernal)g).context().cache().internalCache(DEFAULT_CACHE_NAME).peekEx(i);
if (entry != null)
assertFalse("Entry is locked after implicit transaction commit: " + entry, entry.lockedByAny());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
index 469f662..afc41ff 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
@@ -46,7 +46,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
/** {@inheritDoc} */
@Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(atomicityMode());
ccfg.setCacheMode(PARTITIONED);
@@ -83,7 +83,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
* @throws Exception If failed.
*/
private void testTransform(final Integer key) throws Exception {
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(key, 0);
@@ -104,7 +104,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
}, THREADS, "transform");
for (int i = 0; i < gridCount(); i++) {
- Integer val = (Integer)grid(i).cache(null).get(key);
+ Integer val = (Integer)grid(i).cache(DEFAULT_CACHE_NAME).get(key);
assertEquals("Unexpected value for grid " + i, (Integer)(ITERATIONS_PER_THREAD * THREADS), val);
}
@@ -127,7 +127,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
* @throws Exception If failed.
*/
private void testPut(final Integer key) throws Exception {
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(key, 0);
@@ -150,7 +150,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
}, THREADS, "put");
for (int i = 0; i < gridCount(); i++) {
- Integer val = (Integer)grid(i).cache(null).get(key);
+ Integer val = (Integer)grid(i).cache(DEFAULT_CACHE_NAME).get(key);
assertNotNull("Unexpected value for grid " + i, val);
}
@@ -173,7 +173,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
* @throws Exception If failed.
*/
private void testPutxIfAbsent(final Integer key) throws Exception {
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(key, 0);
@@ -194,7 +194,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
}, THREADS, "putxIfAbsent");
for (int i = 0; i < gridCount(); i++) {
- Integer val = (Integer)grid(i).cache(null).get(key);
+ Integer val = (Integer)grid(i).cache(DEFAULT_CACHE_NAME).get(key);
assertEquals("Unexpected value for grid " + i, (Integer)0, val);
}
@@ -217,7 +217,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
* @throws Exception If failed.
*/
private void testPutGet(final Integer key) throws Exception {
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(key, 0);
@@ -266,7 +266,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
getFut.get();
for (int i = 0; i < gridCount(); i++) {
- Integer val = (Integer)grid(i).cache(null).get(key);
+ Integer val = (Integer)grid(i).cache(DEFAULT_CACHE_NAME).get(key);
assertNotNull("Unexpected value for grid " + i, val);
}
@@ -280,7 +280,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
Integer key0 = null;
for (int i = 0; i < 10_000; i++) {
- if (grid(0).affinity(null).isPrimary(grid(idx).localNode(), i)) {
+ if (grid(0).affinity(DEFAULT_CACHE_NAME).isPrimary(grid(idx).localNode(), i)) {
key0 = i;
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
index 6e2e91f..40e2e23 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
@@ -63,7 +63,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
* @throws Exception If failed.
*/
private void testTransformTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception {
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(key, 0);
@@ -90,7 +90,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
}, THREADS, "transform");
for (int i = 0; i < gridCount(); i++) {
- Integer val = (Integer)grid(i).cache(null).get(key);
+ Integer val = (Integer)grid(i).cache(DEFAULT_CACHE_NAME).get(key);
if (txConcurrency == PESSIMISTIC)
assertEquals("Unexpected value for grid " + i, (Integer)(ITERATIONS_PER_THREAD * THREADS), val);
@@ -100,7 +100,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
if (failed) {
for (int g = 0; g < gridCount(); g++)
- info("Value for cache [g=" + g + ", val=" + grid(g).cache(null).get(key) + ']');
+ info("Value for cache [g=" + g + ", val=" + grid(g).cache(DEFAULT_CACHE_NAME).get(key) + ']');
assertFalse(failed);
}
@@ -134,7 +134,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
* @throws Exception If failed.
*/
private void testPutTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception {
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(key, 0);
@@ -161,7 +161,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
}, THREADS, "put");
for (int i = 0; i < gridCount(); i++) {
- Integer val = (Integer)grid(i).cache(null).get(key);
+ Integer val = (Integer)grid(i).cache(DEFAULT_CACHE_NAME).get(key);
assertNotNull("Unexpected value for grid " + i, val);
}
@@ -195,7 +195,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
* @throws Exception If failed.
*/
private void testPutxIfAbsentTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception {
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(key, 0);
@@ -220,7 +220,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
}, THREADS, "putxIfAbsent");
for (int i = 0; i < gridCount(); i++) {
- Integer val = (Integer)grid(i).cache(null).get(key);
+ Integer val = (Integer)grid(i).cache(DEFAULT_CACHE_NAME).get(key);
assertEquals("Unexpected value for grid " + i, (Integer)0, val);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
index 2b82407..b8f6858 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
@@ -42,7 +42,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
cfg.setPeerClassLoadingEnabled(false);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(CacheMode.PARTITIONED);
ccfg.setNearConfiguration(null);
@@ -60,14 +60,14 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
try {
Ignite ignite = startGrids(2);
- IgniteCache<Object, Object> rmtCache = ignite.cache(null);
+ IgniteCache<Object, Object> rmtCache = ignite.cache(DEFAULT_CACHE_NAME);
int key = 0;
- while (!ignite.affinity(null).isPrimary(grid(1).localNode(), key))
+ while (!ignite.affinity(DEFAULT_CACHE_NAME).isPrimary(grid(1).localNode(), key))
key++;
- IgniteCache<Object, Object> locCache = grid(1).cache(null);
+ IgniteCache<Object, Object> locCache = grid(1).cache(DEFAULT_CACHE_NAME);
try (Transaction tx = grid(1).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
locCache.putIfAbsent(key, 0);
@@ -103,7 +103,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
try {
Ignite grid = startGrid(0);
- IgniteCache<Object, Object> cache = grid.cache(null);
+ IgniteCache<Object, Object> cache = grid.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 30; i++)
cache.put(i, 0);
@@ -113,7 +113,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
awaitPartitionMapExchange();
for (int i = 0; i < 30; i++)
- grid(1).cache(null).put(i, 10);
+ grid(1).cache(DEFAULT_CACHE_NAME).put(i, 10);
// Find a key that does not belong to started node anymore.
int key = 0;
@@ -121,7 +121,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
ClusterNode locNode = grid.cluster().localNode();
for (;key < 30; key++) {
- if (!grid.affinity(null).isPrimary(locNode, key) && !grid.affinity(null).isBackup(locNode, key))
+ if (!grid.affinity(DEFAULT_CACHE_NAME).isPrimary(locNode, key) && !grid.affinity(DEFAULT_CACHE_NAME).isBackup(locNode, key))
break;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
index 81f22d1..308f2b4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
@@ -116,9 +116,9 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
*/
public void testGetFromPrimaryNode() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
- IgniteCache<String, Integer> c = grid(i).cache(null);
+ IgniteCache<String, Integer> c = grid(i).cache(DEFAULT_CACHE_NAME);
- if (grid(i).affinity(null).isPrimary(grid(i).localNode(), KEY)) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimary(grid(i).localNode(), KEY)) {
info("Primary node: " + grid(i).localNode().id());
c.get(KEY);
@@ -135,9 +135,9 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
*/
public void testGetFromBackupNode() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
- IgniteCache<String, Integer> c = grid(i).cache(null);
+ IgniteCache<String, Integer> c = grid(i).cache(DEFAULT_CACHE_NAME);
- if (grid(i).affinity(null).isBackup(grid(i).localNode(), KEY)) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isBackup(grid(i).localNode(), KEY)) {
info("Backup node: " + grid(i).localNode().id());
Integer val = c.get(KEY);
@@ -166,9 +166,9 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
*/
public void testGetFromNearNode() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
- IgniteCache<String, Integer> c = grid(i).cache(null);
+ IgniteCache<String, Integer> c = grid(i).cache(DEFAULT_CACHE_NAME);
- if (!grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), KEY)) {
+ if (!grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), KEY)) {
info("Near node: " + grid(i).localNode().id());
Integer val = c.get(KEY);
@@ -214,11 +214,11 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < GRID_CNT; i++) {
Ignite g = grid(i);
- if (grid(i).affinity(null).isPrimary(grid(i).localNode(), KEY)) {
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimary(grid(i).localNode(), KEY)) {
info("Primary node: " + g.cluster().localNode().id());
// Put value.
- g.cache(null).put(KEY, VAL);
+ g.cache(DEFAULT_CACHE_NAME).put(KEY, VAL);
// Register listener.
((IgniteKernal)g).context().io().addMessageListener(
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
index a0be3a4..7f589fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
@@ -88,7 +88,7 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb
Ignite g1 = grid(1);
for (int i = 0; i < 100; i++)
- assertEquals(g0.affinity(null).mapKeyToNode(i).id(), g1.affinity(null).mapKeyToNode(i).id());
+ assertEquals(g0.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(i).id(), g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(i).id());
}
/** @throws Exception If failed. */
@@ -105,13 +105,13 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb
g1.cluster().forNodeIds(F.asList(g0.cluster().localNode().id(), g1.cluster().localNode().id()));
for (int i = 0; i < 100; i++)
- assertEquals(g0Pinned.ignite().affinity(null).mapKeyToNode(i).id(),
- g01Pinned.ignite().affinity(null).mapKeyToNode(i).id());
+ assertEquals(g0Pinned.ignite().affinity(DEFAULT_CACHE_NAME).mapKeyToNode(i).id(),
+ g01Pinned.ignite().affinity(DEFAULT_CACHE_NAME).mapKeyToNode(i).id());
}
/** @throws Exception If failed. */
@SuppressWarnings("BusyWait")
private void waitTopologyUpdate() throws Exception {
- GridTestUtils.waitTopologyUpdate(null, BACKUPS, log());
+ GridTestUtils.waitTopologyUpdate(DEFAULT_CACHE_NAME, BACKUPS, log());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 02023ff..f134852 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@ -105,7 +105,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
try {
final Ignite ignite1 = startGrid(1);
- final IgniteCache<Integer, Object> cache1 = ignite1.cache(null);
+ final IgniteCache<Integer, Object> cache1 = ignite1.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 5000; i++)
cache1.put(i, VALUE + i);
@@ -129,7 +129,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
Cache.Entry<Integer, Object> entry = cache1.getEntry(i);
if (entry != null)
- ignite1.cache(null).localEvict(Collections.<Object>singleton(entry.getKey()));
+ ignite1.cache(DEFAULT_CACHE_NAME).localEvict(Collections.<Object>singleton(entry.getKey()));
else
info("Entry is null.");
}
@@ -197,8 +197,8 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
assertTrue(GridTestUtils.waitForCondition(new PA() {
@Override public boolean apply() {
- int size1 = ignite1.cache(null).localSize(CachePeekMode.ONHEAP);
- return size1 != oldSize && size1 == ignite2.cache(null).localSize(CachePeekMode.ONHEAP);
+ int size1 = ignite1.cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.ONHEAP);
+ return size1 != oldSize && size1 == ignite2.cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.ONHEAP);
}
}, getTestTimeout()));
@@ -210,7 +210,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
* @return Random entry from cache.
*/
@Nullable private Cache.Entry<Integer, Object> randomEntry(Ignite g) {
- return g.<Integer, Object>cache(null).iterator().next();
+ return g.<Integer, Object>cache(DEFAULT_CACHE_NAME).iterator().next();
}
/**
@@ -222,8 +222,8 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
IgniteKernal g1 = (IgniteKernal) ignite1;
IgniteKernal g2 = (IgniteKernal) ignite2;
- GridCacheAdapter<Integer, Object> cache1 = g1.internalCache();
- GridCacheAdapter<Integer, Object> cache2 = g2.internalCache();
+ GridCacheAdapter<Integer, Object> cache1 = g1.internalCache(DEFAULT_CACHE_NAME);
+ GridCacheAdapter<Integer, Object> cache2 = g2.internalCache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 3; i++) {
if (cache1.size(ALL_PEEK_MODES) != cache2.size(ALL_PEEK_MODES)) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
index d7b0bda..1696d3a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
@@ -50,7 +50,7 @@ public class GridCacheQueryIndexingDisabledSelfTest extends GridCacheAbstractSel
* @param c Closure.
*/
private void doTest(Callable<Object> c) {
- GridTestUtils.assertThrows(log, c, CacheException.class, "Indexing is disabled for cache: null");
+ GridTestUtils.assertThrows(log, c, CacheException.class, "Indexing is disabled for cache: default");
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
index d67c01b..288e572 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
@@ -70,7 +70,7 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes
@SuppressWarnings("unchecked")
public void testInternalKeysPreloading() throws Exception {
try {
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < ENTRY_CNT; i++)
cache.put(new GridCacheQueueHeaderKey("queue" + i), 1);
@@ -80,7 +80,7 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes
for (int i = 0; i < ENTRY_CNT; i++) {
GridCacheQueueHeaderKey internalKey = new GridCacheQueueHeaderKey("queue" + i);
- Collection<ClusterNode> nodes = grid(0).affinity(null).mapKeyToPrimaryAndBackups(internalKey);
+ Collection<ClusterNode> nodes = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToPrimaryAndBackups(internalKey);
for (ClusterNode n : nodes) {
Ignite g = findGridForNodeId(n.id());
@@ -88,7 +88,7 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes
assertNotNull(g);
assertTrue("Affinity node doesn't contain internal key [key=" + internalKey + ", node=" + n + ']',
- ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht().containsKey(internalKey));
+ ((GridNearCacheAdapter)((IgniteKernal)g).internalCache(DEFAULT_CACHE_NAME)).dht().containsKey(internalKey));
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java
index 42bba79..e6a40a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java
@@ -315,7 +315,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
Ignite g = startGrid();
try {
- IgniteCache<Integer, TestValue> cache = g.cache(null);
+ IgniteCache<Integer, TestValue> cache = g.cache(DEFAULT_CACHE_NAME);
refs.add(new WeakReference<Object>(cacheContext(cache)));
@@ -356,7 +356,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
Ignite g = startGrid();
try {
- IgniteCache<Integer, TestValue> cache = g.cache(null);
+ IgniteCache<Integer, TestValue> cache = g.cache(DEFAULT_CACHE_NAME);
refs.add(new WeakReference<Object>(cacheContext(cache)));
@@ -389,7 +389,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
Ignite g = startGrid();
try {
- IgniteCache<Integer, TestValue> cache = g.cache(null);
+ IgniteCache<Integer, TestValue> cache = g.cache(DEFAULT_CACHE_NAME);
refs.add(new WeakReference<Object>(cacheContext(cache)));
@@ -429,7 +429,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
Ignite g = startGrid();
try {
- IgniteCache<Integer, TestValue> cache = g.cache(null);
+ IgniteCache<Integer, TestValue> cache = g.cache(DEFAULT_CACHE_NAME);
refs.add(new WeakReference<Object>(cacheContext(cache)));
@@ -466,7 +466,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
Ignite g = startGrid();
try {
- IgniteCache<Integer, TestValue> cache = g.cache(null);
+ IgniteCache<Integer, TestValue> cache = g.cache(DEFAULT_CACHE_NAME);
refs.add(new WeakReference<Object>(cacheContext(cache)));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
index 10d75ce..f2e4f32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
@@ -107,7 +107,7 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract
try {
Ignite firstIgnite = startGrid("1");
- IgniteCache<Integer, String> firstCache = firstIgnite.cache(null);
+ IgniteCache<Integer, String> firstCache = firstIgnite.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < ADDITION_CACHE_NUMBER; i++)
startGrid(String.valueOf(i + 2));
@@ -137,8 +137,8 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract
Ignite ignite3 = startGrid("3");
- IgniteCache<Integer, String> cache1 = ignite1.cache(null);
- IgniteCache<Integer, String> cache3 = ignite3.cache(null);
+ IgniteCache<Integer, String> cache1 = ignite1.cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, String> cache3 = ignite3.cache(DEFAULT_CACHE_NAME);
IgniteInternalFuture<?> fut = multithreadedAsync(
new Callable<Object>() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 77b1c01..1b06e00 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -56,7 +56,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setBackups(backups);
ccfg.setCacheMode(PARTITIONED);
@@ -117,7 +117,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
failDeserialization = false;
// Get client grid.
- IgniteCache<Integer, TestObject> cache = grid(2).cache(null);
+ IgniteCache<Integer, TestObject> cache = grid(2).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++)
cache.put(i, new TestObject());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
index 890e005..9ccb12a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
@@ -73,7 +73,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disc);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(replicated ? REPLICATED : PARTITIONED);
@@ -153,7 +153,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
IgniteKernal node = (IgniteKernal)ignite(idx % 3 + 1);
- IgniteCache<Integer, Integer> cache = node.cache(null);
+ IgniteCache<Integer, Integer> cache = node.cache(DEFAULT_CACHE_NAME);
while (true) {
try {
@@ -173,7 +173,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
@Override public Void call() throws Exception {
IgniteKernal node = (IgniteKernal)ignite(0);
- IgniteCache<Integer, Integer> cache = node.cache(null);
+ IgniteCache<Integer, Integer> cache = node.cache(DEFAULT_CACHE_NAME);
while (!fut1.isDone()) {
try {
@@ -253,7 +253,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
final CountDownLatch readyLatch = new CountDownLatch(PUT_THREADS);
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
index 9b08f4d..81a17bb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
@@ -108,6 +108,9 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract
protected CacheConfiguration cacheConfiguration() {
CacheConfiguration cc = defaultCacheConfiguration();
+ // Template
+ cc.setName("*");
+
cc.setRebalanceMode(SYNC);
cc.setCacheStoreFactory(singletonFactory(store));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java
index 40f3070..2175abb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java
@@ -53,7 +53,7 @@ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
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/GridCacheStoreValueBytesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
index 8802422..237ae72 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
@@ -80,11 +80,11 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest {
Ignite g0 = startGrid(0);
Ignite g1 = startGrid(1);
- IgniteCache<Integer, String> c = g0.cache(null);
+ IgniteCache<Integer, String> c = g0.cache(DEFAULT_CACHE_NAME);
c.put(1, "Cached value");
- GridCacheEntryEx entry = ((IgniteKernal)g1).internalCache().entryEx(1);
+ GridCacheEntryEx entry = ((IgniteKernal)g1).internalCache(DEFAULT_CACHE_NAME).entryEx(1);
assert entry != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
index 6979859..261411f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
@@ -102,7 +102,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
try {
startGrid(0);
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
Set<Integer> keys = new HashSet<>();
@@ -128,7 +128,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
startGrid(1);
- int size = grid(1).cache(null).localSize(CachePeekMode.ALL);
+ int size = grid(1).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.ALL);
info("New node cache size: " + size);
@@ -165,7 +165,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
try {
startGrid(0);
- final IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
assertNotNull(cache);
@@ -207,7 +207,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
fut = null;
- int size = grid(1).cache(null).localSize(CachePeekMode.PRIMARY, CachePeekMode.BACKUP,
+ int size = grid(1).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.PRIMARY, CachePeekMode.BACKUP,
CachePeekMode.NEAR, CachePeekMode.ONHEAP);
info("New node cache size: " + size);
@@ -217,7 +217,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
int next = 0;
- for (IgniteCache.Entry<Integer, Integer> e : grid(1).<Integer, Integer>cache(null).localEntries())
+ for (IgniteCache.Entry<Integer, Integer> e : grid(1).<Integer, Integer>cache(DEFAULT_CACHE_NAME).localEntries())
keySet.add(e.getKey());
for (Integer i : keySet) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
index 87f58a3..8a2f5d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
@@ -121,7 +121,7 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
// Explicitly create near cache for even client nodes
for (int i = srvNodesCnt; i < gridCount(); i++)
- grid(i).createNearCache(null, new NearCacheConfiguration<>());
+ grid(i).createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<>());
final AtomicInteger threadsCnt = new AtomicInteger();
@@ -134,7 +134,7 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
assert node.configuration().isClientMode();
- IgniteCache<Integer, Integer> cache = node.cache(null);
+ IgniteCache<Integer, Integer> cache = node.cache(DEFAULT_CACHE_NAME);
boolean isNearCacheNode = clientIdx % 2 == 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
index b227364..fcb5261 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
@@ -214,7 +214,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid
*/
private void testCommits(TransactionConcurrency concurrency, TransactionIsolation isolation, boolean put)
throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < TX_CNT; i++) {
Transaction tx = grid(0).transactions().txStart(concurrency, isolation);
@@ -231,7 +231,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid
for (int i = 0; i < gridCount(); i++) {
TransactionMetrics metrics = grid(i).transactions().metrics();
- CacheMetrics cacheMetrics = grid(i).cache(null).localMetrics();
+ CacheMetrics cacheMetrics = grid(i).cache(DEFAULT_CACHE_NAME).localMetrics();
if (i == 0) {
assertEquals(TX_CNT, metrics.txCommits());
@@ -259,7 +259,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid
*/
private void testRollbacks(TransactionConcurrency concurrency, TransactionIsolation isolation,
boolean put) throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < TX_CNT; i++) {
Transaction tx = grid(0).transactions().txStart(concurrency, isolation);
@@ -276,7 +276,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid
for (int i = 0; i < gridCount(); i++) {
TransactionMetrics metrics = grid(i).transactions().metrics();
- CacheMetrics cacheMetrics = grid(i).cache(null).localMetrics();
+ CacheMetrics cacheMetrics = grid(i).cache(DEFAULT_CACHE_NAME).localMetrics();
assertEquals(0, metrics.txCommits());
assertEquals(0, cacheMetrics.getCacheTxCommits());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
index 29ffe87..66ef47c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
@@ -59,7 +59,7 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest
cfg.setDiscoverySpi(discoSpi);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(cacheMode);
ccfg.setEagerTtl(true);
@@ -104,9 +104,9 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest
final IgniteKernal g = (IgniteKernal)startGrid(0);
try {
- final IgniteCache<Object, Object> cache = g.cache(null);
+ final IgniteCache<Object, Object> cache = g.cache(DEFAULT_CACHE_NAME);
- final GridCacheContext<Object, Object> cctx = g.cachex(null).context();
+ final GridCacheContext<Object, Object> cctx = g.cachex(DEFAULT_CACHE_NAME).context();
for (int i = 1; i <= ENTRIES_TO_PUT; i++) {
String key = "Some test entry key#" + i;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
index 4820bd3..1e04cb6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
@@ -46,7 +46,7 @@ public class GridCacheTtlManagerLoadTest extends GridCacheTtlManagerSelfTest {
IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
- IgniteCache<Object,Object> cache = g.cache(null).
+ IgniteCache<Object,Object> cache = g.cache(DEFAULT_CACHE_NAME).
withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000)));
long key = 0;
@@ -61,7 +61,7 @@ public class GridCacheTtlManagerLoadTest extends GridCacheTtlManagerSelfTest {
}
}, 1);
- GridCacheTtlManager ttlMgr = g.internalCache().context().ttl();
+ GridCacheTtlManager ttlMgr = g.internalCache(DEFAULT_CACHE_NAME).context().ttl();
for (int i = 0; i < 300; i++) {
U.sleep(1000);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerNotificationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerNotificationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerNotificationTest.java
index 519e975..d25b2af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerNotificationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerNotificationTest.java
@@ -71,7 +71,7 @@ public class GridCacheTtlManagerNotificationTest extends GridCommonAbstractTest
CacheConfiguration[] ccfgs = new CacheConfiguration[CACHES_CNT + 1];
- ccfgs[0] = createCacheConfiguration(null);
+ ccfgs[0] = createCacheConfiguration(DEFAULT_CACHE_NAME);
for (int i = 0; i < CACHES_CNT; i++)
ccfgs[i + 1] = createCacheConfiguration(CACHE_PREFIX + i);
@@ -86,7 +86,7 @@ public class GridCacheTtlManagerNotificationTest extends GridCommonAbstractTest
* @return Cache configuration.
*/
private CacheConfiguration createCacheConfiguration(String name) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(cacheMode);
ccfg.setEagerTtl(true);
@@ -112,7 +112,7 @@ public class GridCacheTtlManagerNotificationTest extends GridCommonAbstractTest
final String key = "key";
- IgniteCache<Object, Object> cache = g.cache(null);
+ IgniteCache<Object, Object> cache = g.cache(DEFAULT_CACHE_NAME);
ExpiryPolicy plc1 = new CreatedExpiryPolicy(new Duration(MILLISECONDS, 100_000));
@@ -141,7 +141,7 @@ public class GridCacheTtlManagerNotificationTest extends GridCommonAbstractTest
final int cnt = 1_000;
try (final Ignite g = startGrid(0)) {
- final IgniteCache<Object, Object> cache = g.cache(null);
+ final IgniteCache<Object, Object> cache = g.cache(DEFAULT_CACHE_NAME);
g.events().localListen(new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
index b26d2b7..18c0b32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
@@ -56,7 +56,7 @@ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(cacheMode);
ccfg.setEagerTtl(true);
@@ -99,20 +99,20 @@ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest {
try {
final String key = "key";
- g.cache(null).withExpiryPolicy(
+ g.cache(DEFAULT_CACHE_NAME).withExpiryPolicy(
new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000))).put(key, 1);
- assertEquals(1, g.cache(null).get(key));
+ assertEquals(1, g.cache(DEFAULT_CACHE_NAME).get(key));
U.sleep(1100);
GridTestUtils.retryAssert(log, 10, 100, new CAX() {
@Override public void applyx() {
// Check that no more entries left in the map.
- assertNull(g.cache(null).get(key));
+ assertNull(g.cache(DEFAULT_CACHE_NAME).get(key));
- if (!g.internalCache().context().deferredDelete())
- assertNull(g.internalCache().map().getEntry(g.internalCache().context().toCacheKeyObject(key)));
+ if (!g.internalCache(DEFAULT_CACHE_NAME).context().deferredDelete())
+ assertNull(g.internalCache(DEFAULT_CACHE_NAME).map().getEntry(g.internalCache(DEFAULT_CACHE_NAME).context().toCacheKeyObject(key)));
}
});
}