http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java index 6c276b3..9ef8a9f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java @@ -168,7 +168,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT * @return Affinity. */ private CacheConsistentHashAffinityFunction affinity(int idx) { - return (CacheConsistentHashAffinityFunction)grid(idx).jcache(null).configuration().getAffinity(); + return (CacheConsistentHashAffinityFunction)grid(idx).jcache(null).getConfiguration(CacheConfiguration.class).getAffinity(); } /** @@ -279,7 +279,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT // Evict on primary node. // It will trigger dht eviction and eviction on backup node. - grid(primary).jcache(null).evict(key); + grid(primary).jcache(null).localEvict(Collections.<Object>singleton(key)); futOther.get(3000); futBackup.get(3000);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java index 923515f..efcf07d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java @@ -162,7 +162,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { * @return Affinity. */ private CacheConsistentHashAffinityFunction affinity(int idx) { - return (CacheConsistentHashAffinityFunction)grid(idx).jcache(null).configuration().getAffinity(); + return (CacheConsistentHashAffinityFunction)grid(idx).jcache(null).getConfiguration(CacheConfiguration.class).getAffinity(); } /** @@ -251,7 +251,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { // Evict on primary node. // It should trigger dht eviction and eviction on backup node. - grid(primary).jcache(null).evict(key); + grid(primary).jcache(null).localEvict(Collections.<Object>singleton(key)); // Give 5 seconds for eviction event to occur on backup and primary node. futBackup.get(3000); @@ -327,7 +327,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { // Evict on primary node. // Eviction of the last key should trigger queue processing. for (Integer key : keys) - primaryIgnite.jcache(null).evict(key); + primaryIgnite.jcache(null).localEvict(Collections.<Object>singleton(key)); // Give 5 seconds for eviction events to occur on backup and primary node. futBackup.get(3000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java index 2eb5f3b..3cdc844 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java @@ -37,7 +37,6 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; /** * Tests for internal DHT entry. @@ -144,8 +143,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { * @return Atomic long value. */ private Object peekGlobal(ClusterNode node) { - return grid(node).jcache(null).peek( - new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME)); + return grid(node).jcache(null).localPeek(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), CachePeekMode.ONHEAP); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java index eb26c1f..ebbd71d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.resources.*; @@ -57,7 +56,7 @@ public class GridCacheDhtMultiBackupTest extends GridCommonAbstractTest { IgniteCache<SampleKey, SampleValue> cache = g.jcache("partitioned"); - assert cache.isEmpty(); + assert cache.localSize() == 0; } } ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index 9ca3949..fe88081 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -116,10 +116,10 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { IgniteCache<String, Integer> c2 = g2.jcache(null); for (int i = 0; i < cnt; i++) - assertNull(c1.peek(Integer.toString(i))); + assertNull(c1.localPeek(Integer.toString(i), CachePeekMode.ONHEAP)); for (int i = 0; i < cnt; i++) - assertNull(c2.peek(Integer.toString(i))); + assertNull(c2.localPeek(Integer.toString(i), CachePeekMode.ONHEAP)); final CountDownLatch l1 = new CountDownLatch(1); final CountDownLatch l2 = new CountDownLatch(1); @@ -193,10 +193,10 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { IgniteCache<String, Integer> c2 = g2.jcache(null); for (int i = 0; i < cnt; i++) - assertNull(c1.peek(Integer.toString(i))); + assertNull(c1.localPeek(Integer.toString(i), CachePeekMode.ONHEAP)); for (int i = 0; i < cnt; i++) - assertNull(c2.peek(Integer.toString(i))); + assertNull(c2.localPeek(Integer.toString(i), CachePeekMode.ONHEAP)); final CountDownLatch l1 = new CountDownLatch(1); final CountDownLatch l2 = new CountDownLatch(1); @@ -399,7 +399,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { String key = Integer.toString(i); if (affinity(c).isPrimaryOrBackup(g.cluster().localNode(), key)) - assertEquals(Integer.valueOf(i), c.peek(key)); + assertEquals(Integer.valueOf(i), c.localPeek(key, CachePeekMode.ONHEAP)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java index 4b7d4b0..1248770 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java @@ -197,7 +197,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest IgniteCache<Integer, String> c = g.jcache(null); for (int i = 0; i < keyCnt; i++) - assertNull(c.peek(i)); + assertNull(c.localPeek(i, CachePeekMode.ONHEAP)); } Collection<Integer> keys = new LinkedList<>(); @@ -221,7 +221,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest IgniteCache<Integer, String> c = gg.jcache(null); for (int i = 0; i < keyCnt; i++) - assertNull(c.peek(i)); + assertNull(c.localPeek(i, CachePeekMode.ONHEAP)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java index 08f0eec..cec7d43 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java @@ -129,7 +129,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest String key = Integer.toString(i); if (affinity(c).isPrimaryOrBackup(g.cluster().localNode(), key)) - assertEquals(Integer.valueOf(i), c.peek(key)); + assertEquals(Integer.valueOf(i), c.localPeek(key, CachePeekMode.ONHEAP)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java index 81f9a1f..e66a512 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java @@ -149,9 +149,9 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext assertEquals("val3", reader.jcache(null).get(key3)); if (nearEnabled()) { - assertEquals("val1", reader.jcache(null).peek(key1)); - assertEquals("val2", reader.jcache(null).peek(key2)); - assertEquals("val3", reader.jcache(null).peek(key3)); + assertEquals("val1", reader.jcache(null).localPeek(key1, CachePeekMode.ONHEAP)); + assertEquals("val2", reader.jcache(null).localPeek(key2, CachePeekMode.ONHEAP)); + assertEquals("val3", reader.jcache(null).localPeek(key3, CachePeekMode.ONHEAP)); } try (IgniteTx tx = grid(0).transactions() @@ -166,9 +166,9 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext } if (nearEnabled()) { - assertEquals("val01", reader.jcache(null).peek(key1)); - assertEquals("val02", reader.jcache(null).peek(key2)); - assertEquals("val03", reader.jcache(null).peek(key3)); + assertEquals("val01", reader.jcache(null).localPeek(key1, CachePeekMode.ONHEAP)); + assertEquals("val02", reader.jcache(null).localPeek(key2, CachePeekMode.ONHEAP)); + assertEquals("val03", reader.jcache(null).localPeek(key3, CachePeekMode.ONHEAP)); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java index ddf1b1f..9a33e21 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java @@ -90,7 +90,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb // TODO: getting of removed key will produce inner write and 4 inner read operations. //g.cache(null).remove(0); - assert g.jcache(null).isEmpty(); + assert g.jcache(null).localSize() == 0; g.jcache(null).mxBean().clear(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java index f347ba3..89bc2e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java @@ -173,7 +173,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { if (primary || backup) assertEquals("Invalid cache value [nodeId=" + node.id() + ", primary=" + primary + - ", backup=" + backup + ", key=" + key + ']', val, cache.peek(key)); + ", backup=" + backup + ", key=" + key + ']', val, cache.localPeek(key, CachePeekMode.ONHEAP)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java index 5cbbf19..0f48cb4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java @@ -95,7 +95,7 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi IgniteCache<Integer, Integer> cache = grid(idx).jcache(null); for (int i = 0; i < keyCnt; i++) { - Integer val = cache.peek(i); + Integer val = cache.localPeek(i, CachePeekMode.ONHEAP); if (val != null) { assertEquals("Invalid value for key: " + i, (Integer)r, val); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index 843a1ca..29596b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java @@ -296,8 +296,8 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache }, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED); } - cache.localEvict(Collections.<String>singleton(k2)); - cache.localEvict(Collections.<String>singleton(k3)); + cache.localEvict(Collections.singleton(k2)); + cache.localEvict(Collections.singleton(k3)); assert !cache.containsKey(k1); assert !cache.containsKey(k2); @@ -335,7 +335,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache assertEquals(cnt, swapEvts.get()); assertEquals(cnt, unswapEvts.get()); - cache.localEvict(Collections.<String>singleton(k1)); + cache.localEvict(Collections.singleton(k1)); assertEquals((Integer)1, cache.get(k1)); @@ -355,8 +355,8 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache swapEvts.set(0); unswapEvts.set(0); - cache.localEvict(Collections.<String>singleton(k2)); - cache.localEvict(Collections.<String>singleton(k3)); + cache.localEvict(Collections.singleton(k2)); + cache.localEvict(Collections.singleton(k3)); assert !cache.containsKey(k1); assert !cache.containsKey(k2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java index 0489bf2..e6c4efa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java @@ -132,7 +132,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe Thread.sleep(ttl + 100); // Expired entry should not be swapped. - cache.localEvict(Collections.<String>singleton(key)); + cache.localEvict(Collections.singleton(key)); assertNull(cache.localPeek(key, CachePeekMode.ONHEAP)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java index ba808bc..5c64df9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java @@ -81,7 +81,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - g.jcache(null).configuration().setStatisticsEnabled(true); + g.jcache(null).getConfiguration(CacheConfiguration.class).setStatisticsEnabled(true); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java index 089b85a..8b21927 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java @@ -51,17 +51,17 @@ public class GridCacheNearOnlySelfTest extends GridCacheClientModesAbstractSelfT IgniteCache<Object, Object> nearOnlyCache = nearOnlyCache(); for (int i = 0; i < keyCnt; i++) { - assertNull(nearOnlyCache.peek(i)); + assertNull(nearOnlyCache.localPeek(i, CachePeekMode.ONHEAP)); assertEquals(i, nearOnlyCache.get(i)); - assertEquals(i, nearOnlyCache.peek(i)); + assertEquals(i, nearOnlyCache.localPeek(i, CachePeekMode.ONHEAP)); } for (int i = 0; i < keyCnt; i++) dhtCache.put(i, i * i); for (int i = 0; i < keyCnt; i++) { - assertEquals(i * i, nearOnlyCache.peek(i)); + assertEquals(i * i, nearOnlyCache.localPeek(i, CachePeekMode.ONHEAP)); assertEquals(i * i, nearOnlyCache.get(i)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java index c2d063f..410d890 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.cluster.*; @@ -166,14 +167,14 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { // Populate near cache. for (int i = 0; i < 10; i++) { assertEquals(i, nearOnly.get(i)); - assertEquals(i, nearOnly.peek(i)); + assertEquals(i, nearOnly.localPeek(i, CachePeekMode.ONHEAP)); } // Stop the only dht node. stopGrid(1); for (int i = 0; i < 10; i++) { - assertNull(nearOnly.peek(i)); + assertNull(nearOnly.localPeek(i, CachePeekMode.ONHEAP)); final int key = i; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java index 48da12d..34ef4aa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; @@ -116,7 +115,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes cache0.removeAll(); - assert cache0.isEmpty(); + assert cache0.localSize() == 0; } cache.put(key, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/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 879e240..9cf7283 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 @@ -196,7 +196,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest for (Map.Entry<Object, Integer> entry : data.entrySet()) { int part = aff.partition(entry.getKey()); Collection<ClusterNode> affNodes = aff.nodes(part, nodes, 1); - UUID act = F.<ClusterNode>first(affNodes).id(); + UUID act = F.first(affNodes).id(); UUID exp = nodes.get(entry.getValue()).id(); if (!exp.equals(act)) { @@ -485,7 +485,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest ignite.name() + ']'); } - Collection<? extends ClusterNode> affNodes = nodes(affinity(ignite), e.<Object>key()); + Collection<? extends ClusterNode> affNodes = nodes(affinity(ignite), e.key()); if (!affNodes.contains(ignite.cluster().localNode())) { failFlag.set(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/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 d6ce670..4251357 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 @@ -308,7 +308,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst IgniteCache<String, Integer> c = pri.jcache(null); - Integer oldCntr = c.peek(CNTR_KEY); + Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); GridCacheEntryEx<String, Integer> dhtNear = near(pri).peekEx(CNTR_KEY); @@ -405,7 +405,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst IgniteCache<String, Integer> c = near.jcache(null); - Integer oldCntr = c.peek(CNTR_KEY); + Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); try (IgniteTx tx = near.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) @@ -490,7 +490,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst IgniteCache<String, Integer> cache = grid(i).jcache(null); - int cntr = nearThreads > 0 && nears.contains(g) ? cache.get(CNTR_KEY) : cache.peek(CNTR_KEY); + int cntr = nearThreads > 0 && nears.contains(g) ? cache.get(CNTR_KEY) : cache.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); X.println("*** Cache counter [grid=" + g.name() + ", cntr=" + cntr + ']'); @@ -578,7 +578,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst IgniteCache<String, Integer> cache = grid(i).jcache(null); - int cntr = cache.peek(CNTR_KEY); + int cntr = cache.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); info("*** Cache counter [grid=" + g.name() + ", cntr=" + cntr + ']'); @@ -642,7 +642,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst IgniteCache<String, Integer> c = near.jcache(null); - Integer oldCntr = c.peek(CNTR_KEY); + Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); try (IgniteTx tx = near.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) @@ -711,7 +711,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst IgniteCache<String, Integer> c = pri.jcache(null); - Integer oldCntr = c.peek(CNTR_KEY); + Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); GridCacheEntryEx<String, Integer> dhtNear = near(pri).peekEx(CNTR_KEY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/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 173dff3..538b5a4 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 @@ -153,7 +153,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int k = 0; k < size; k++) { if (affinity(cache).isPrimaryOrBackup(node, k)) - assertEquals("Check failed for node: " + node.id(), k, cache.peek(k)); + assertEquals("Check failed for node: " + node.id(), k, cache.localPeek(k, ONHEAP)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java index e008926..b76e0f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java @@ -199,7 +199,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb for (Map.Entry<UUID, Person> entry : entries) { assertEquals(entry.getKey(), entry.getValue().id()); - assert F.<Person>asList(persons).contains(entry.getValue()); + assert F.asList(persons).contains(entry.getValue()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java index 6abab30..73eaaec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java @@ -31,6 +31,7 @@ import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import java.io.*; +import java.util.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; @@ -133,11 +134,11 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac assert v2.getClass().getClassLoader().getClass().getName().contains("GridDeploymentClassLoader"); // To swap storage. - cache2.evict(key); + cache2.localEvict(Collections.<Object>singleton(key)); - cache2.promote(key); + cache2.localPromote(Collections.singleton(key)); - v2 = cache2.peek(key); + v2 = cache2.localPeek(key, CachePeekMode.ONHEAP); log.info("Unswapped entry value: " + v2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/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 4d92eb5..51c0ed5 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 @@ -249,7 +249,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { IgniteCache<Integer, Object> cache3 = g3.jcache(null); - Object v3 = cache3.peek(1); + Object v3 = cache3.localPeek(1, CachePeekMode.ONHEAP); assert v3 != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java index 4be0310..ddb3542 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java @@ -136,7 +136,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest if (keys.size() == batchSize) { for (Long key : keys) - cache.evict(key); + cache.localEvict(Collections.<Object>singleton(key)); evictedKeysCnt.addAndGet(batchSize); @@ -165,7 +165,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest if (keys.size() == batchSize) { for (Long key : keys) - cache.promote(key); + cache.localPromote(Collections.singleton(key)); unswappedKeys.addAndGet(batchSize); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/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 0b89103..631e79e 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 @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.eviction; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.eviction.lru.*; @@ -223,7 +222,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb info("Entry removed: " + rmv); } - if (!cache.isEmpty()) { + if (!(cache.localSize() == 0)) { boolean zombies = false; for (Cache.Entry<Integer, Integer> e : cache) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index 9b2270a..5d0c06e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -177,7 +177,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size()); for (int i = 0; i < 100; i++) - cache.evict(i); + cache.localEvict(Collections.singleton(i)); assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size()); assertEquals(0, cache.size()); @@ -209,7 +209,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size()); for (Integer key : keys) - cache.evict(key); + cache.localEvict(Collections.singleton(key)); assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size()); assertEquals(0, cache.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index f26141f..10cee0f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -178,7 +178,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte */ @SuppressWarnings("TooBroadScope") public void testSwap() throws Exception { - assert cache.configuration().isSwapEnabled(); + assert cache.getConfiguration(CacheConfiguration.class).isSwapEnabled(); byte[] val1 = wrap(1); Object val2 = 2; @@ -189,11 +189,11 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte assert Arrays.equals(val1, (byte[])cache.get(KEY_1)); assert F.eq(val2, cache.get(KEY_2)); - cache.evict(KEY_1); - cache.evict(KEY_2); + cache.localEvict(Collections.singleton(KEY_1)); + cache.localEvict(Collections.singleton(KEY_2)); - assert cache.peek(KEY_1) == null; - assert cache.peek(KEY_2) == null; + assert cache.localPeek(KEY_1, CachePeekMode.ONHEAP) == null; + assert cache.localPeek(KEY_2, CachePeekMode.ONHEAP) == null; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java index 267d568..20a316d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -645,7 +645,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { for (int i = 0; i < 9; i++) ldr.addData(i, i); - assertTrue(c.isEmpty()); + assertTrue(c.localSize() == 0); multithreaded(new Callable<Void>() { @Override @@ -697,7 +697,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { for (int i = 0; i < 9; i++) ldr.addData(i, i); - assertTrue(c.isEmpty()); + assertTrue(c.localSize() == 0); ldr.tryFlush(); @@ -735,7 +735,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { IgniteCache<Integer, Integer> c = g.jcache(null); - assertTrue(c.isEmpty()); + assertTrue(c.localSize() == 0); IgniteDataLoader<Integer, Integer> ldr = g.dataLoader(null); @@ -745,11 +745,11 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { for (int i = 0; i < 9; i++) ldr.addData(i, i); - assertTrue(c.isEmpty()); + assertTrue(c.localSize() == 0); assertFalse(latch.await(1000, MILLISECONDS)); - assertTrue(c.isEmpty()); + assertTrue(c.localSize() == 0); assertTrue(latch.await(3000, MILLISECONDS)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java index 5b077bb..976f72d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java @@ -75,7 +75,7 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest { GridFinishedFuture<Object> fut = m.unmarshal(m.marshal(orig), clsLdr); - assertEquals(t, GridTestUtils.<Object>getFieldValue(fut, "t")); + assertEquals(t, GridTestUtils.getFieldValue(fut, "t")); if (ex == null) assertNull(GridTestUtils.<Throwable>getFieldValue(fut, "err")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java index 9b32d0f..0a1bf52 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java @@ -86,7 +86,7 @@ public class GridTestMain { comp.affinityRun("partitioned", GridTestKey.affinityKey(key), new IgniteRunnable() { // This code will execute on remote nodes by collocating keys with cached data. @Override public void run() { - Long val = cache.peek(new GridTestKey(key)); + Long val = cache.localPeek(new GridTestKey(key), CachePeekMode.ONHEAP); if (val == null || val != key) throw new RuntimeException("Invalid value found [key=" + key + ", val=" + val + ']'); @@ -141,7 +141,7 @@ public class GridTestMain { exe.submit(new Runnable() { @Override public void run() { - Long val = cache.peek(new GridTestKey(key)); + Long val = cache.localPeek(new GridTestKey(key), CachePeekMode.ONHEAP); if (val == null || val != key) throw new RuntimeException("Invalid value found [key=" + key + ", val=" + val + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java index be5fb80..afb287f 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java @@ -18,6 +18,7 @@ package org.apache.ignite.loadtests.mapper; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.internal.util.typedef.*; @@ -88,7 +89,7 @@ public class GridContinuousMapperTask1 extends ComputeTaskAdapter<Integer, Integ X.println(">>> Received job for ID: " + jobId); - return g.jcache("replicated").peek(jobId); + return g.jcache("replicated").localPeek(jobId, CachePeekMode.ONHEAP); } }, n); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java index ba41743..d5ee8b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java @@ -18,6 +18,7 @@ package org.apache.ignite.loadtests.mapper; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.internal.util.typedef.*; @@ -50,7 +51,7 @@ public class GridContinuousMapperTask2 extends ComputeTaskAdapter<int[], Integer X.println(">>> Received job for ID: " + jobId); - return g.jcache("replicated").peek(jobId); + return g.jcache("replicated").localPeek(jobId, CachePeekMode.ONHEAP); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java index fd1c56c..0a61f38 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java @@ -163,7 +163,7 @@ public class GridSwapEvictAllBenchmark { if (keys.size() == batchSize) { for (Long key : keys) - cache.evict(key); + cache.localEvict(Collections.<Object>singleton(key)); evictedKeysCnt.addAndGet(batchSize); @@ -218,7 +218,7 @@ public class GridSwapEvictAllBenchmark { if (keys.size() == batchSize) { for (Long key : keys) - cache.promote(key); + cache.localPromote(Collections.singleton(key)); unswappedKeys.addAndGet(batchSize); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java index 17fd056..bb66ef1 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java @@ -89,12 +89,12 @@ abstract class GridAbstractMultinodeRedeployTest extends GridCommonAbstractTest ignite1.compute().localDeployTask(loadTaskClass(), loadTaskClass().getClassLoader()); ignite2.compute().localDeployTask(loadTaskClass(), loadTaskClass().getClassLoader()); - ComputeTaskFuture<Integer> fut1 = executeAsync(ignite1.compute(), TASK_NAME, Arrays.<UUID>asList( + ComputeTaskFuture<Integer> fut1 = executeAsync(ignite1.compute(), TASK_NAME, Arrays.asList( ignite1.cluster().localNode().id(), ignite2.cluster().localNode().id(), ignite3.cluster().localNode().id())); - ComputeTaskFuture<Integer> fut2 = executeAsync(ignite2.compute(), TASK_NAME, Arrays.<UUID>asList( + ComputeTaskFuture<Integer> fut2 = executeAsync(ignite2.compute(), TASK_NAME, Arrays.asList( ignite1.cluster().localNode().id(), ignite2.cluster().localNode().id(), ignite3.cluster().localNode().id())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java index 96bf6dd..695df73 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java @@ -97,7 +97,7 @@ public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTes assertNull(data.get(1)); - assertTrue(data.isEmpty()); + assertTrue(data.localSize() == 0); assertEquals(1, cp.size()); assertEquals("1", cp.get(1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java index 568987f..97a0144 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java @@ -475,7 +475,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel for (Map.Entry<UUID, Person> entry : entries) { assertEquals(entry.getKey(), entry.getValue().id()); - assert F.<Person>asList(persons).contains(entry.getValue()); + assert F.asList(persons).contains(entry.getValue()); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4c7e86b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala index c3a03ae..ed3cf9c 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala @@ -78,7 +78,7 @@ class VisorCacheCompactCommandSpec extends VisorRuntimeBaseSpec(2) { it should "show correct result for default cache" in { Ignition.ignite("node-1").jcache[Int, Int](null).putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) - Ignition.ignite("node-1").jcache[Int, Int](null).evict(1) + Ignition.ignite("node-1").jcache[Int, Int](null).localEvict(Set(1)) VisorCacheCompactCommand().compact(Nil, None) } @@ -86,7 +86,7 @@ class VisorCacheCompactCommandSpec extends VisorRuntimeBaseSpec(2) { it should "show correct result for named cache" in { Ignition.ignite("node-1").jcache[Int, Int]("cache").putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) - Ignition.ignite("node-1").jcache[Int, Int]("cache").evict(1) + Ignition.ignite("node-1").jcache[Int, Int]("cache").localEvict(Set(1)) visor.cache("-compact -c=cache") }
