http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java index 8669863..d988b2c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java @@ -31,7 +31,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; -import org.apache.ignite.internal.processors.cache.GridCacheInternal; import org.apache.ignite.internal.processors.cache.GridCacheUtils; import org.apache.ignite.internal.processors.datastructures.GridCacheInternalKeyImpl; import org.apache.ignite.internal.util.typedef.G; @@ -317,25 +316,6 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends IgniteAtomics /** * @throws Exception If failed. */ - public void testEviction() throws Exception { - String locSeqName = UUID.randomUUID().toString(); - - IgniteAtomicSequence locSeq = grid().atomicSequence(locSeqName, 0, true); - - locSeq.addAndGet(153); - - GridCacheAdapter cache = ((IgniteKernal)grid()).internalCache(GridCacheUtils.ATOMICS_CACHE_NAME); - - assertNotNull(cache); - - cache.evictAll(cache.keySet()); - - assert null != cache.get(new GridCacheInternalKeyImpl(locSeqName)); - } - - /** - * @throws Exception If failed. - */ public void testRemove() throws Exception { String locSeqName = UUID.randomUUID().toString(); @@ -376,23 +356,6 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends IgniteAtomics } }, IllegalStateException.class, null); - for (Object o : cache.keySet()) - assert !(o instanceof GridCacheInternal) : "Wrong keys [key=" + o + ']'; - - for (Object o : cache.values()) - assert !(o instanceof GridCacheInternal) : "Wrong values [value=" + o + ']'; - - for (Object o : cache.entrySet()) - assert !(o instanceof GridCacheInternal) : "Wrong entries [entry=" + o + ']'; - - assert cache.keySet().isEmpty(); - - assert cache.values().isEmpty(); - - assert cache.entrySet().isEmpty(); - - assert cache.size() == 0; - for (String seqName : seqNames) assert null != cache.get(new GridCacheInternalKeyImpl(seqName)); }
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index c63df40..9973b27 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -39,6 +39,7 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; +import org.apache.ignite.internal.processors.cache.GridCacheMapEntry; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.internal.U; @@ -798,8 +799,8 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr GridCacheContext cctx = GridTestUtils.getFieldValue(set0, "cctx"); for (int i = 0; i < gridCount(); i++) { - Iterator<GridCacheEntryEx> entries = - (grid(i)).context().cache().internalCache(cctx.name()).map().allEntries0().iterator(); + Iterator<GridCacheMapEntry> entries = + (grid(i)).context().cache().internalCache(cctx.name()).map().entries().iterator(); while (entries.hasNext()) { GridCacheEntryEx entry = entries.next(); http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java index ca57205..e6e09c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java @@ -29,8 +29,8 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteSet; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; +import org.apache.ignite.internal.processors.cache.GridCacheMapEntry; import org.apache.ignite.internal.processors.datastructures.SetItemKey; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -174,8 +174,8 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect Set<IgniteUuid> setIds = new HashSet<>(); for (int i = 0; i < gridCount(); i++) { - Iterator<GridCacheEntryEx> entries = - ((IgniteKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator(); + Iterator<GridCacheMapEntry> entries = + grid(i).context().cache().internalCache().map().entries().iterator(); while (entries.hasNext()) { GridCacheEntryEx entry = entries.next(); @@ -228,4 +228,4 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect } }); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java index 4a21765..e88c97b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java @@ -27,6 +27,7 @@ import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteAtomicReference; import org.apache.ignite.IgniteAtomicSequence; import org.apache.ignite.IgniteAtomicStamped; +import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteCountDownLatch; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteQueue; @@ -349,7 +350,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT for (IgniteInternalFuture<Object> fut : futs) { Object res = fut.get(); - if (res instanceof IgniteException) + if (res instanceof IgniteException || res instanceof IgniteCheckedException) continue; assertTrue("Unexpected object: " + res, http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java index 880c638..f57e1c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CollectionConfiguration; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.cache.GridCacheContext; -import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; +import org.apache.ignite.internal.processors.cache.GridCacheMapEntry; import org.apache.ignite.testframework.GridTestUtils; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -79,8 +79,8 @@ public class IgnitePartitionedQueueNoBackupsTest extends GridCachePartitionedQue for (int i = 0; i < gridCount(); i++) { IgniteKernal grid = (IgniteKernal)grid(i); - Iterator<GridCacheEntryEx> entries = - grid.context().cache().internalCache(cctx.name()).map().allEntries0().iterator(); + Iterator<GridCacheMapEntry> entries = + grid.context().cache().internalCache(cctx.name()).map().entries().iterator(); if (entries.hasNext()) { if (setNodeId == null) http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java index 2d23d2a..a73aa4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java @@ -23,7 +23,7 @@ import java.util.UUID; import org.apache.ignite.configuration.CollectionConfiguration; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.cache.GridCacheContext; -import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; +import org.apache.ignite.internal.processors.cache.GridCacheMapEntry; import org.apache.ignite.testframework.GridTestUtils; /** @@ -57,8 +57,8 @@ public class IgnitePartitionedSetNoBackupsSelfTest extends GridCachePartitionedS for (int i = 0; i < gridCount(); i++) { IgniteKernal grid = (IgniteKernal)grid(i); - Iterator<GridCacheEntryEx> entries = - grid.context().cache().internalCache(cctx.name()).map().allEntries0().iterator(); + Iterator<GridCacheMapEntry> entries = + grid.context().cache().internalCache(cctx.name()).map().entries().iterator(); if (entries.hasNext()) { if (setNodeId == null) http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java index dd46e23..377a55f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java @@ -85,7 +85,12 @@ public class GridCacheDhtTestUtils { for (int i = 0; i < keyCnt; i++) { KeyCacheObject cacheKey = ctx.toCacheKeyObject(i); - cacheMap.putEntry(AffinityTopologyVersion.NONE, cacheKey, ctx.toCacheKeyObject("value" + i)); + cacheMap.putEntryIfObsoleteOrAbsent( + AffinityTopologyVersion.NONE, + cacheKey, + ctx.toCacheKeyObject("value" + i), + false, + false); dht.preloader().request(Collections.singleton(cacheKey), AffinityTopologyVersion.NONE); @@ -224,4 +229,4 @@ public class GridCacheDhtTestUtils { ", entry=" + entry + ", node partitions=" + affParts + "]"); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java index 4c92f90..d0fe936 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java @@ -59,8 +59,8 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { jcache().removeAll(); - assertEquals("DHT entries: " + dht().entries(), 0, dht().size()); - assertEquals("Near entries: " + near().entries(), 0, near().size()); + assertEquals("DHT entries: " + dht().entrySet(), 0, dht().size()); + assertEquals("Near entries: " + near().entrySet(), 0, near().size()); assertEquals(0, jcache().size()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7470b3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java index e4d39d6..d67092f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java @@ -75,7 +75,7 @@ import java.util.List; import java.util.Map; import java.util.Queue; import java.util.Random; -import java.util.Set; + import java.util.concurrent.Callable; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicBoolean; @@ -1021,9 +1021,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } } }, 10_000)) { - Set<GridCacheEntryEx> set = dataCache.allEntries(); + Iterable<? extends GridCacheEntryEx> entries = dataCache.allEntries(); - for (GridCacheEntryEx e: set) { + for (GridCacheEntryEx e: entries) { X.println("deleted = " + e.deleted()); X.println("detached = " + e.detached()); X.println("info = " + e.info()); @@ -3238,9 +3238,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { private static void dumpCache(String cacheName, GridCacheAdapter<?,?> cache) { X.println("=============================== " + cacheName + " cache dump: "); - Set<GridCacheEntryEx> set = cache.entries(); + Iterable<? extends GridCacheEntryEx> entries = cache.entries(); - for (GridCacheEntryEx e: set) + for (GridCacheEntryEx e: entries) X.println("Lost " + cacheName + " entry = " + e); }
