http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java index 11bf0e3..25dee29 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java @@ -31,8 +31,8 @@ import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Data loader performance test. Compares group lock data loader to traditional lock.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 cddfd81..f652a65 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 @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.dataload; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -32,7 +33,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.*; @@ -40,9 +40,9 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -100,7 +100,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { cc.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY); cc.setWriteSynchronizationMode(FULL_SYNC); - cc.setEvictionPolicy(new GridCacheFifoEvictionPolicy(10000)); + cc.setEvictionPolicy(new CacheFifoEvictionPolicy(10000)); cc.setEvictSynchronized(false); cc.setEvictNearSynchronized(false); @@ -638,7 +638,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { try { Ignite g = startGrid(); - final GridCache<Integer, Integer> c = g.cache(null); + final Cache<Integer, Integer> c = g.cache(null); final IgniteDataLoader<Integer, Integer> ldr = g.dataLoader(null); @@ -690,7 +690,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { try { Ignite g = startGrid(); - GridCache<Integer, Integer> c = g.cache(null); + Cache<Integer, Integer> c = g.cache(null); IgniteDataLoader<Integer, Integer> ldr = g.dataLoader(null); @@ -735,7 +735,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_PUT); - GridCache<Integer, Integer> c = g.cache(null); + Cache<Integer, Integer> c = g.cache(null); assertTrue(c.isEmpty()); @@ -871,7 +871,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<?, ?> entry) { + @Override public void write(javax.cache.Cache.Entry<?, ?> entry) { storeMap.put(entry.getKey(), entry.getValue()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index a893520..131a594 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -70,7 +70,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm private static GridCacheAdapter<GridGgfsBlockKey, byte[]> dataCache; /** Eviction policy */ - private static GridCacheGgfsPerBlockLruEvictionPolicy evictPlc; + private static CacheGgfsPerBlockLruEvictionPolicy evictPlc; /** * Start a grid with the primary file system. @@ -99,11 +99,11 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm dataCacheCfg.setName("dataCache"); dataCacheCfg.setCacheMode(PARTITIONED); - dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dataCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); - evictPlc = new GridCacheGgfsPerBlockLruEvictionPolicy(); + evictPlc = new CacheGgfsPerBlockLruEvictionPolicy(); dataCacheCfg.setEvictionPolicy(evictPlc); dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); @@ -114,8 +114,8 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -161,8 +161,8 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm dataCacheCfg.setName("dataCache"); dataCacheCfg.setCacheMode(PARTITIONED); - dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dataCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); @@ -172,8 +172,8 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java index df1fe5c..b2fb15b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java @@ -38,7 +38,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.IgniteFs.*; import static org.apache.ignite.fs.IgniteFsMode.*; @@ -123,7 +123,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes protected final boolean dual; /** Memory mode. */ - protected final GridCacheMemoryMode memoryMode; + protected final CacheMemoryMode memoryMode; /** * Constructor. @@ -134,7 +134,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes this(mode, ONHEAP_TIERED); } - protected GridGgfsAbstractSelfTest(IgniteFsMode mode, GridCacheMemoryMode memoryMode) { + protected GridGgfsAbstractSelfTest(IgniteFsMode mode, CacheMemoryMode memoryMode) { assert mode != null && mode != PROXY; this.mode = mode; @@ -198,8 +198,8 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes dataCacheCfg.setName("dataCache"); dataCacheCfg.setCacheMode(PARTITIONED); - dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dataCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(2)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); @@ -211,7 +211,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -772,7 +772,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes @SuppressWarnings("ConstantConditions") public void _testFormat() throws Exception { GridKernal grid = (GridKernal)G.ignite("grid"); - GridCache cache = grid.internalCache("dataCache"); + Cache cache = grid.internalCache("dataCache"); if (dual) create(ggfsSecondary, paths(DIR, SUBDIR, DIR_NEW, SUBDIR_NEW), paths(FILE, FILE_NEW)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java index 7043db5..28d557f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java @@ -77,13 +77,13 @@ public class GridGgfsCacheSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setCacheMode(REPLICATED); else { cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setBackups(0); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); } - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java index 1dabf07..75a05e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java @@ -117,13 +117,13 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setCacheMode(REPLICATED); else { cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setBackups(0); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(DATA_BLOCK_GROUP_CNT)); } - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setQueryIndexEnabled(false); @@ -517,7 +517,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { * @param affinity Affinity block locations to check. */ private void checkAffinity(int blockSize, GridGgfsFileInfo info, Iterable<IgniteFsBlockLocation> affinity) { - GridCache<Object, Object> dataCache = grid(0).cachex(DATA_CACHE_NAME); + Cache<Object, Object> dataCache = grid(0).cachex(DATA_CACHE_NAME); for (IgniteFsBlockLocation loc : affinity) { info("Going to check GGFS block location: " + loc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java index 6e969df..09b0219 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java @@ -1249,7 +1249,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT GridGgfsBlockKey key = new GridGgfsBlockKey(info.id(), info.affinityKey(), info.evictExclude(), 2); - GridCache<GridGgfsBlockKey, byte[]> dataCache = ggfs.context().kernalContext().cache().cache( + Cache<GridGgfsBlockKey, byte[]> dataCache = ggfs.context().kernalContext().cache().cache( ggfs.configuration().getDataCacheName()); for (int i = 0; i < 10; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java index 63271ca..b6f1f0f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java @@ -31,9 +31,9 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*; import static org.apache.ignite.testframework.GridTestUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java index 7b92f32..877bbf3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java @@ -120,8 +120,8 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { dataCacheCfg.setName("dataCache"); dataCacheCfg.setCacheMode(PARTITIONED); - dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dataCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); @@ -131,8 +131,8 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -172,8 +172,8 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { dataCacheCfg.setName("dataCache"); dataCacheCfg.setCacheMode(PARTITIONED); - dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dataCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); @@ -183,8 +183,8 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java index 08ae351..28b417e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java @@ -103,8 +103,8 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -114,7 +114,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -160,8 +160,8 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -171,7 +171,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapTieredSelfTest.java index f82e917..22d10a2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapTieredSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapTieredSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.fs; import static org.apache.ignite.fs.IgniteFsMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; /** * Tests for PRIMARY mode and OFFHEAP_TIERED memory. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapValuesSelfTest.java index 191cbe5..b74623f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsPrimaryOffheapValuesSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.fs; import static org.apache.ignite.fs.IgniteFsMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; /** * Tests for PRIMARY mode and OFFHEAP_VALUES memory. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java index db65443..81c9f78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java @@ -61,7 +61,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { protected IgniteFs ggfs; /** Meta cache. */ - private GridCache<Object, Object> metaCache; + private Cache<Object, Object> metaCache; /** Meta cache name. */ private String metaCacheName; @@ -131,13 +131,13 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setCacheMode(REPLICATED); else { cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setBackups(0); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); } - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setQueryIndexEnabled(false); @@ -411,7 +411,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { ggfs.delete(path("/"), false); assertEquals(Collections.<IgniteFsPath>emptyList(), ggfs.listPaths(path("/"))); - for (GridCacheEntry<Object, Object> e : metaCache) + for (CacheEntry<Object, Object> e : metaCache) info("Entry in cache [key=" + e.getKey() + ", val=" + e.getValue() + ']'); } @@ -682,8 +682,8 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { IgniteUuid fileId = U.field(ggfs.info(path), "fileId"); - GridCache<IgniteUuid, GridGgfsFileInfo> metaCache = grid(0).cachex(META_CACHE_NAME); - GridCache<GridGgfsBlockKey, byte[]> dataCache = grid(0).cachex(DATA_CACHE_NAME); + Cache<IgniteUuid, GridGgfsFileInfo> metaCache = grid(0).cachex(META_CACHE_NAME); + Cache<GridGgfsBlockKey, byte[]> dataCache = grid(0).cachex(DATA_CACHE_NAME); GridGgfsFileInfo info = metaCache.get(fileId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java index 93e2746..18f48c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java @@ -41,9 +41,9 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -132,7 +132,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { dataCfg.setBackups(0); } - dataCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dataCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); dataCfg.setPreloadMode(SYNC); dataCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCfg.setQueryIndexEnabled(false); @@ -143,7 +143,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { metaCfg.setName(META_CACHE_NAME); metaCfg.setCacheMode(REPLICATED); - metaCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCfg.setPreloadMode(SYNC); metaCfg.setQueryIndexEnabled(false); metaCfg.setAtomicityMode(TRANSACTIONAL); @@ -489,7 +489,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { os.write(chunk((int)ggfsMaxData)); os.close(); - final GridCache<IgniteUuid, GridGgfsFileInfo> metaCache = ggfs.context().kernalContext().cache().cache( + final Cache<IgniteUuid, GridGgfsFileInfo> metaCache = ggfs.context().kernalContext().cache().cache( ggfs.configuration().getMetaCacheName()); // Start a transaction in a separate thread which will lock file ID. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java index 0a72f97..c3b5c60 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java @@ -133,13 +133,13 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setCacheMode(REPLICATED); else { cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setBackups(0); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(CFG_GRP_SIZE)); } - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setQueryIndexEnabled(false); @@ -152,8 +152,8 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { * @throws IgniteCheckedException In case of exception. */ public void testConfiguration() throws IgniteCheckedException { - GridCache metaCache = getFieldValue(fs, "meta", "metaCache"); - GridCache dataCache = getFieldValue(fs, "data", "dataCache"); + Cache metaCache = getFieldValue(fs, "meta", "metaCache"); + Cache dataCache = getFieldValue(fs, "data", "dataCache"); assertNotNull(metaCache); assertEquals(META_CACHE_NAME, metaCache.name()); @@ -255,7 +255,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { // After this we should have first two block colocated with grid 0 and last block colocated with grid 1. IgniteFsFileImpl fileImpl = (IgniteFsFileImpl)fs.info(path); - GridCache<Object, Object> metaCache = grid(0).cachex(META_CACHE_NAME); + Cache<Object, Object> metaCache = grid(0).cachex(META_CACHE_NAME); GridGgfsFileInfo fileInfo = (GridGgfsFileInfo)metaCache.get(fileImpl.fileId()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java index 13c5e40..b11d7bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java @@ -36,9 +36,9 @@ import java.io.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; /** @@ -122,7 +122,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); - dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); IgniteConfiguration cfg = new IgniteConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java index f6841ca..a1ca6ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java @@ -31,9 +31,9 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index b5be05f..b6836e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -232,7 +232,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { /** * @param cacheName Name of the cache. * - * @return Instance of a GridCache proxy. + * @return Instance of a Cache proxy. */ @Override protected GridCacheProjectionEx<Object, Object> localCache(String cacheName) throws IgniteCheckedException { final GridCacheProjectionEx<Object, Object> cache = super.localCache(cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java index f5e6c86..87815aa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -570,7 +570,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs private Ignite ignite; /** */ - private GridCache<String, Value> cache; + private Cache<String, Value> cache; /** Cache key. */ private String key; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java index 5fa580f..878eb78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java @@ -29,8 +29,8 @@ import java.util.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java index e89835f..c7c81c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java @@ -244,7 +244,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm public void testPutRandomKeys() throws Exception { map = newMap(); - GridCacheAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(parts, null); + CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(parts, null); getTestResources().inject(aff); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index 014aba4..f8c469e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -76,7 +76,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G keys = new T3[LOAD_CNT]; wrappers = new GridByteArrayWrapper[LOAD_CNT]; - GridCacheAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(); Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java index 7e86096..5760b79 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.offheap.*; public class GridUnsafePartitionedMapPerformanceTest extends GridOffHeapPartitionedMapPerformanceAbstractTest { /** {@inheritDoc} */ @Override protected GridOffHeapPartitionedMap newMap() { - return GridOffHeapMapFactory.unsafePartitionedMap(GridCacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, + return GridOffHeapMapFactory.unsafePartitionedMap(CacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, Runtime.getRuntime().availableProcessors(), load, LOAD_CNT, mem, lruStripes, null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java index fe3f031..ebbf30f 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java @@ -2719,7 +2719,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(1); try { - GridCache<String, String> cache = g.cache(null); + Cache<String, String> cache = g.cache(null); cache.put("k1", "v1"); cache.put("k2", "v2"); @@ -2741,7 +2741,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(1); try { - GridCache<String, String> cache = g.cache(null); + Cache<String, String> cache = g.cache(null); cache.put("k1", "v1"); @@ -2778,7 +2778,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(1); try { - GridCache<String, String> cache = g.cache(null); + Cache<String, String> cache = g.cache(null); cache.put("k1", "v1"); cache.put("k2", "v2"); @@ -2809,7 +2809,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(1); try { - GridCache<String, String> cache = g.cache(null); + Cache<String, String> cache = g.cache(null); cache.put("k1", "v1"); cache.put("k2", "v2"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java index 7b71851..33d2718 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java @@ -27,9 +27,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Multi-node cache test. @@ -67,7 +67,7 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest { cacheCfg.setStartSize(10); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - cacheCfg.setEvictionPolicy(new GridCacheLruEvictionPolicy(100000)); + cacheCfg.setEvictionPolicy(new CacheLruEvictionPolicy(100000)); cacheCfg.setBackups(1); cacheCfg.setPreloadMode(SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java index a4564e1..037f50e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java @@ -123,15 +123,15 @@ abstract class GridCacheAbstractLoadTest { * @param writeClos Write closure. * @param readClos ReadClosure. */ - protected void loadTest(final CIX1<GridCacheProjection<Integer, Integer>> writeClos, - final CIX1<GridCacheProjection<Integer, Integer>> readClos) { + protected void loadTest(final CIX1<CacheProjection<Integer, Integer>> writeClos, + final CIX1<CacheProjection<Integer, Integer>> readClos) { info("Read threads: " + readThreads()); info("Write threads: " + writeThreads()); info("Test duration (ms): " + testDuration); Ignite ignite = G.ignite(); - final GridCache<Integer, Integer> cache = ignite.cache(null); + final Cache<Integer, Integer> cache = ignite.cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java index 1ce45ca..efe0eb3 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java @@ -30,11 +30,11 @@ import java.io.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** */ @@ -59,7 +59,7 @@ public class GridCacheAffinityTransactionsOffHeapTest { startNodes(); for (int i = 0; i < KEY_CNT; i++) { - GridCache<Object, Integer> c = cache(i); + Cache<Object, Integer> c = cache(i); c.putx((long)i, 0); c.putx(new UserKey(i, 0), 0); @@ -71,7 +71,7 @@ public class GridCacheAffinityTransactionsOffHeapTest { long key = 5; - GridCache<Object, Integer> c = cache(key); + Cache<Object, Integer> c = cache(key); try (IgniteTx tx = c.txStartAffinity(key, PESSIMISTIC, REPEATABLE_READ, 0, 0)) { Integer val = c.get(key); @@ -108,7 +108,7 @@ public class GridCacheAffinityTransactionsOffHeapTest { // while (!Thread.currentThread().isInterrupted()) { // long key = rnd.nextInt(KEY_CNT); // -// GridCache<Object, Integer> c = cache(key); +// Cache<Object, Integer> c = cache(key); // // try (GridCacheTx tx = c.txStartAffinity(key, PESSIMISTIC, REPEATABLE_READ, 0, 0)) { // Integer val = c.get(key); @@ -153,7 +153,7 @@ public class GridCacheAffinityTransactionsOffHeapTest { * @param key Key. * @return Cache. */ - private static GridCache<Object, Integer> cache(long key) { + private static Cache<Object, Integer> cache(long key) { UUID id = Ignition.ignite("grid-0").cache(null).affinity().mapKeyToNode(key).id(); return Ignition.ignite(id).cache(null); @@ -200,7 +200,7 @@ public class GridCacheAffinityTransactionsOffHeapTest { */ private static class UserKey implements Externalizable { /** */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private long affKey; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java index b781f59..9598902 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java @@ -72,7 +72,7 @@ public class GridCacheBenchmark { X.println("threadCnt=" + THREADS); X.println("testWrite=" + testWrite); - final GridCache<Long, Long> cache = g.cache(CACHE); + final Cache<Long, Long> cache = g.cache(CACHE); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java index b5a45cd..ad4c07a 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java @@ -76,11 +76,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad } /** Atomic long write closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> longWriteClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> longWriteClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true); + CacheAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true); for (int i = 0; i < operationsPerTx; i++) { al.addAndGet(RAND.nextInt(MAX_INT)); @@ -94,11 +94,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Atomic long read closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> longReadClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> longReadClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true); + CacheAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true); for (int i = 0; i < operationsPerTx; i++) { al.get(); @@ -112,11 +112,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Atomic reference write closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> refWriteClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> refWriteClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME, + CacheAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME, null, true); for (int i = 0; i < operationsPerTx; i++) { @@ -131,11 +131,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Atomic reference read closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> refReadClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> refReadClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME, null, + CacheAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME, null, true); for (int i = 0; i < operationsPerTx; i++) { @@ -150,11 +150,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Atomic sequence write closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> seqWriteClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> seqWriteClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true); + CacheAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true); for (int i = 0; i < operationsPerTx; i++) { as.addAndGet(RAND.nextInt(MAX_INT) + 1); @@ -168,11 +168,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Atomic sequence read closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> seqReadClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> seqReadClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true); + CacheAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true); for (int i = 0; i < operationsPerTx; i++) { as.get(); @@ -186,11 +186,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Atomic stamped write closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> stampWriteClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> stampWriteClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME, + CacheAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME, 0, 0, true); for (int i = 0; i < operationsPerTx; i++) { @@ -205,11 +205,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Atomic stamped read closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> stampReadClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> stampReadClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME, + CacheAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME, 0, 0, true); for (int i = 0; i < operationsPerTx; i++) { @@ -224,11 +224,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Queue write closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> queueWriteClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> queueWriteClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true); + CacheQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true); for (int i = 0; i < operationsPerTx; i++) { q.put(RAND.nextInt(MAX_INT)); @@ -242,11 +242,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Queue read closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> queueReadClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> queueReadClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true); + CacheQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true); for (int i = 0; i < operationsPerTx; i++) { q.peek(); @@ -260,11 +260,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Count down latch write closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> latchWriteClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> latchWriteClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT, + CacheCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT, true, true); for (int i = 0; i < operationsPerTx; i++) { @@ -279,11 +279,11 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad }; /** Count down latch read closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> latchReadClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> latchReadClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { - GridCacheCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT, + CacheCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT, true, true); for (int i = 0; i < operationsPerTx; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java index e8c7b11..e22d09e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheGroupLockComparisonTest.java @@ -83,7 +83,7 @@ public class GridCacheGroupLockComparisonTest { X.println(">>> Testing putAll"); X.println(">>>"); - final GridCache<GridCacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE); + final Cache<CacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE); assert cache != null; @@ -96,7 +96,7 @@ public class GridCacheGroupLockComparisonTest { GridTestUtils.runMultiThreaded(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (true) { - Map<GridCacheAffinityKey<Long>, Long> vals = + Map<CacheAffinityKey<Long>, Long> vals = new HashMap<>(BATCH_SIZE); long start = cntr.getAndAdd(BATCH_SIZE); @@ -105,7 +105,7 @@ public class GridCacheGroupLockComparisonTest { break; for (long i = start; i < start + BATCH_SIZE; i++) - vals.put(new GridCacheAffinityKey<>(i % 100000, start), i); + vals.put(new CacheAffinityKey<>(i % 100000, start), i); cache.putAll(vals); @@ -138,7 +138,7 @@ public class GridCacheGroupLockComparisonTest { X.println(">>> Testing group lock"); X.println(">>>"); - final GridCache<GridCacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE); + final Cache<CacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE); assert cache != null; @@ -174,7 +174,7 @@ public class GridCacheGroupLockComparisonTest { try (IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, BATCH_SIZE)) { for (long i = 0; i < BATCH_SIZE; i++) { - cache.put(new GridCacheAffinityKey<>((key % rangeCnt) + base, affKey), i); + cache.put(new CacheAffinityKey<>((key % rangeCnt) + base, affKey), i); key++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java index 0d5935c..e754e64 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java @@ -45,9 +45,9 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest { } /** Write closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> writeClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> writeClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { for (int i = 0; i < operationsPerTx; i++) { int kv = RAND.nextInt(KEY_RANGE); @@ -63,9 +63,9 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest { }; /** Read closure. */ - private final CIX1<GridCacheProjection<Integer, Integer>> readClos = - new CIX1<GridCacheProjection<Integer, Integer>>() { - @Override public void applyx(GridCacheProjection<Integer, Integer> cache) + private final CIX1<CacheProjection<Integer, Integer>> readClos = + new CIX1<CacheProjection<Integer, Integer>>() { + @Override public void applyx(CacheProjection<Integer, Integer> cache) throws IgniteCheckedException { for (int i = 0; i < operationsPerTx; i++) { int k = RAND.nextInt(KEY_RANGE); @@ -102,7 +102,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest { private void memoryTest() { Ignite ignite = G.ignite(); - final GridCache<Integer, byte[]> cache = ignite.cache(null); + final Cache<Integer, byte[]> cache = ignite.cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java index dab5cf1..4dd6c73 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java @@ -32,8 +32,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * The benchmark that performs put and remove operations on the cache to identify memory leaks. @@ -45,7 +45,7 @@ public class GridCachePutRemoveLoadTest { private final Arguments args; /** */ - private GridCache<Object, Object> cache; + private Cache<Object, Object> cache; /** * @param args Arguments. @@ -104,7 +104,7 @@ public class GridCachePutRemoveLoadTest { CacheConfiguration cacheCfg = cfg.getCacheConfiguration()[0]; - GridCacheDistributionMode distro = i == 0 && + CacheDistributionMode distro = i == 0 && args.distribution() == CLIENT_ONLY ? CLIENT_ONLY : PARTITIONED_ONLY; cacheCfg.setCacheMode(args.cache()); @@ -125,7 +125,7 @@ public class GridCachePutRemoveLoadTest { cacheCfg.setAtomicityMode(args.transactional() ? TRANSACTIONAL : ATOMIC); if (args.evictionEnabled()) - cacheCfg.setEvictionPolicy(new GridCacheLruEvictionPolicy(1000)); + cacheCfg.setEvictionPolicy(new CacheLruEvictionPolicy(1000)); G.start(cfg); } @@ -240,7 +240,7 @@ public class GridCachePutRemoveLoadTest { /** */ @Parameter(names = "-sm", description = "Synchronization Mode") - private GridCacheWriteSynchronizationMode syncMode = GridCacheWriteSynchronizationMode.PRIMARY_SYNC; + private CacheWriteSynchronizationMode syncMode = CacheWriteSynchronizationMode.PRIMARY_SYNC; /** */ @Parameter(names = "-wo", description = "Write Ordering Mode") @@ -248,7 +248,7 @@ public class GridCachePutRemoveLoadTest { /** */ @Parameter(names = "-dm", description = "Distribution mode") - private GridCacheDistributionMode distroMode = PARTITIONED_ONLY; + private CacheDistributionMode distroMode = PARTITIONED_ONLY; /** */ @Parameter(names = "-ot", description = "Tiered Offheap") @@ -284,7 +284,7 @@ public class GridCachePutRemoveLoadTest { /** * @return Distribution. */ - public GridCacheDistributionMode distribution() { + public CacheDistributionMode distribution() { return distroMode; } @@ -298,7 +298,7 @@ public class GridCachePutRemoveLoadTest { /** * @return Synchronization. */ - public GridCacheWriteSynchronizationMode synchronization() { + public CacheWriteSynchronizationMode synchronization() { return syncMode; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java index 24b9d78..3dad229 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java @@ -34,7 +34,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** */ @@ -77,7 +77,7 @@ public class GridCacheSingleNodeLoadTest { GridTestUtils.runMultiThreaded(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { - GridCache<Integer, Student> cache = G.ignite().cache(null); + Cache<Integer, Student> cache = G.ignite().cache(null); assert cache != null; @@ -130,8 +130,8 @@ public class GridCacheSingleNodeLoadTest { cc.setCacheMode(PARTITIONED); cc.setBackups(1); - cc.setNearEvictionPolicy(new GridCacheLruEvictionPolicy(10000)); - cc.setEvictionPolicy(new GridCacheLruEvictionPolicy(300000)); + cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(10000)); + cc.setEvictionPolicy(new CacheLruEvictionPolicy(300000)); cc.setSwapEnabled(false); cc.setDistributionMode(PARTITIONED_ONLY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java index 66e99f8..acd20c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java @@ -202,7 +202,7 @@ public class GridCacheSwapLoadTest { return GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { - GridCache<Integer, Integer> cache = g.cache(null); + Cache<Integer, Integer> cache = g.cache(null); assert cache != null; @@ -234,7 +234,7 @@ public class GridCacheSwapLoadTest { @Nullable @Override public Object call() throws Exception { getRemoveStartedLatch.await(); - GridCache<Integer, Integer> cache = g.cache(null); + Cache<Integer, Integer> cache = g.cache(null); assert cache != null; @@ -268,7 +268,7 @@ public class GridCacheSwapLoadTest { @Nullable @Override public Object call() throws Exception { getRemoveStartedLatch.await(); - GridCache<Integer, Integer> cache = g.cache(null); + Cache<Integer, Integer> cache = g.cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index 1342c24..6ac745e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.loadtests.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -27,12 +28,11 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Basic store test. @@ -61,7 +61,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void write(Cache.Entry e) { + @Override public void write(javax.cache.Cache.Entry e) { // No-op. } @@ -80,7 +80,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - GridCache<?, ?> cache = cache(); + Cache<?, ?> cache = cache(); if (cache != null) cache.clearAll(); @@ -151,7 +151,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { private void loadCache() throws Exception { final AtomicBoolean running = new AtomicBoolean(true); - final GridCache<Long, String> cache = cache(); + final Cache<Long, String> cache = cache(); final AtomicLong keyCntr = new AtomicLong(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java index da78a2d..4de249d 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java @@ -46,7 +46,7 @@ public class GridCapacityLoadTest { IgniteConfiguration cfg = (IgniteConfiguration)ctx.getBean("grid.cfg"); try (Ignite g = G.start(cfg)) { - GridCache<Integer, Integer> c = g.cache(null); + Cache<Integer, Integer> c = g.cache(null); long init = mem.getHeapMemoryUsage().getUsed(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml index 1b9bf75..40b0309 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml @@ -77,7 +77,7 @@ sets the number of backups to 0 to ensure maximum capacity.. --> <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction"> <property name="keyBackups" value="0"/> <!-- No backups. --> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java index 9c75f9a..cdbdd97 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java @@ -19,12 +19,12 @@ package org.apache.ignite.loadtests.colocation; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.store.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.jdk8.backport.*; -import javax.cache.*; import javax.cache.integration.*; import java.util.concurrent.*; @@ -59,12 +59,12 @@ public class GridTestCacheStore extends CacheStoreAdapter<GridTestKey, Long> { try { ExecutorCompletionService<Object> completeSvc = new ExecutorCompletionService<>(execSvc); - GridCache<GridTestKey, Long> cache = ignite.cache("partitioned"); + Cache<GridTestKey, Long> cache = ignite.cache("partitioned"); assert cache != null; // Get projection just to check affinity for Integer. - final GridCacheProjection<Integer, Long> prj = cache.projection(Integer.class, Long.class); + final CacheProjection<Integer, Long> prj = cache.projection(Integer.class, Long.class); final LongAdder adder = new LongAdder(); @@ -123,7 +123,7 @@ public class GridTestCacheStore extends CacheStoreAdapter<GridTestKey, Long> { } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<? extends GridTestKey, ? extends Long> e) { + @Override public void write(javax.cache.Cache.Entry<? extends GridTestKey, ? extends Long> e) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java index bb399aa..9286119 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestKey.java @@ -42,7 +42,7 @@ public class GridTestKey implements Externalizable { return id; } - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped public int affinityKey() { return affinityKey(id); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java index bd011f4..2be57fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java @@ -31,7 +31,7 @@ public class GridTestLifecycleBean implements LifecycleBean { @Override public void onLifecycleEvent(LifecycleEventType type) throws IgniteCheckedException { if (type == LifecycleEventType.AFTER_GRID_START) { - GridCache<GridTestKey, Long> cache = g.cache("partitioned"); + Cache<GridTestKey, Long> cache = g.cache("partitioned"); assert cache != null;
