http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index 1514673..4d345c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -66,7 +66,6 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC; -import static org.apache.ignite.testframework.GridTestUtils.TestMemoryMode; /** * Test GridDhtInvalidPartitionException handling in ATOMIC cache during restarts. @@ -85,9 +84,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA /** Write sync. */ private CacheWriteSynchronizationMode writeSync; - /** Memory mode. */ - private TestMemoryMode memMode; - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); @@ -107,8 +103,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA if (testClientNode() && getTestIgniteInstanceName(0).equals(igniteInstanceName)) cfg.setClientMode(true); - GridTestUtils.setMemoryMode(cfg, ccfg, memMode, 100, 1024); - return cfg; } @@ -150,99 +144,54 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA * @throws Exception If failed. */ public void testClockFullSync() throws Exception { - checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.HEAP); - } - - /** - * @throws Exception If failed. - */ - public void testClockFullSyncSwap() throws Exception { - checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.SWAP); - } - - /** - * @throws Exception If failed. - */ - public void testClockFullSyncOffheapTiered() throws Exception { - checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED); - } - - /** - * @throws Exception If failed. - */ - public void testClockFullSyncOffheapSwap() throws Exception { - checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP); + checkRestarts(CLOCK, FULL_SYNC); } /** * @throws Exception If failed. */ public void testClockPrimarySync() throws Exception { - checkRestarts(CLOCK, PRIMARY_SYNC, TestMemoryMode.HEAP); + checkRestarts(CLOCK, PRIMARY_SYNC); } /** * @throws Exception If failed. */ public void testClockFullAsync() throws Exception { - checkRestarts(CLOCK, FULL_ASYNC, TestMemoryMode.HEAP); + checkRestarts(CLOCK, FULL_ASYNC); } /** * @throws Exception If failed. */ public void testPrimaryFullSync() throws Exception { - checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.HEAP); - } - - /** - * @throws Exception If failed. - */ - public void testPrimaryFullSyncSwap() throws Exception { - checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.SWAP); - } - - /** - * @throws Exception If failed. - */ - public void testPrimaryFullSyncOffheapTiered() throws Exception { - checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED); - } - - /** - * @throws Exception If failed. - */ - public void testPrimaryFullSyncOffheapSwap() throws Exception { - checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP); + checkRestarts(PRIMARY, FULL_SYNC); } /** * @throws Exception If failed. */ public void testPrimaryPrimarySync() throws Exception { - checkRestarts(PRIMARY, PRIMARY_SYNC, TestMemoryMode.HEAP); + checkRestarts(PRIMARY, PRIMARY_SYNC); } /** * @throws Exception If failed. */ public void testPrimaryFullAsync() throws Exception { - checkRestarts(PRIMARY, FULL_ASYNC, TestMemoryMode.HEAP); + checkRestarts(PRIMARY, FULL_ASYNC); } /** * @param writeOrder Write order to check. * @param writeSync Write synchronization mode to check. - * @param memMode Memory mode. * @throws Exception If failed. */ private void checkRestarts(CacheAtomicWriteOrderMode writeOrder, - CacheWriteSynchronizationMode writeSync, - TestMemoryMode memMode) + CacheWriteSynchronizationMode writeSync) throws Exception { this.writeOrder = writeOrder; this.writeSync = writeSync; - this.memMode = memMode; final int gridCnt = 6;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index 5c625aa..a546d89 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cache.affinity.AffinityKeyMapped; http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java index 144d362..0eb7a42 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java @@ -21,7 +21,6 @@ import java.util.Random; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; @@ -33,7 +32,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC; @@ -54,9 +52,6 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { /** Cache atomicity mode specified by test. */ private CacheAtomicityMode atomicityMode; - /** Memory mode. */ - private CacheMemoryMode memMode; - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration c = super.getConfiguration(igniteInstanceName); @@ -65,7 +60,6 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { cc.setCacheMode(PARTITIONED); cc.setAtomicityMode(atomicityMode); - cc.setMemoryMode(memMode); cc.setWriteSynchronizationMode(PRIMARY_SYNC); cc.setRebalanceMode(SYNC); cc.setStartSize(100); @@ -95,7 +89,6 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { */ public void testAtomicNearEvictionMaxSize() throws Exception { atomicityMode = ATOMIC; - memMode = ONHEAP_TIERED; checkNearEvictionMaxSize(); } @@ -105,7 +98,6 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { */ public void testTransactionalNearEvictionMaxSize() throws Exception { atomicityMode = TRANSACTIONAL; - memMode = ONHEAP_TIERED; checkNearEvictionMaxSize(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java index a2f6f62..5b0a12c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.eviction.lru; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy; import org.apache.ignite.configuration.CacheConfiguration; @@ -33,7 +32,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -61,9 +59,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes /** Cache atomicity mode specified by test. */ private CacheAtomicityMode atomicityMode; - /** Memory mode. */ - private CacheMemoryMode memMode; - /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { super.beforeTest(); @@ -82,7 +77,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes cc.setCacheMode(cacheMode); cc.setAtomicityMode(atomicityMode); - cc.setMemoryMode(memMode); cc.setWriteSynchronizationMode(PRIMARY_SYNC); cc.setRebalanceMode(SYNC); cc.setStartSize(100); @@ -104,7 +98,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes public void testPartitionedAtomicNearEvictionMaxSize() throws Exception { atomicityMode = ATOMIC; cacheMode = PARTITIONED; - memMode = ONHEAP_TIERED; checkNearEvictionMaxSize(); } @@ -115,7 +108,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes public void testPartitionedTransactionalNearEvictionMaxSize() throws Exception { atomicityMode = TRANSACTIONAL; cacheMode = PARTITIONED; - memMode = ONHEAP_TIERED; checkNearEvictionMaxSize(); } @@ -126,7 +118,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes public void testReplicatedAtomicNearEvictionMaxSize() throws Exception { atomicityMode = ATOMIC; cacheMode = REPLICATED; - memMode = ONHEAP_TIERED; checkNearEvictionMaxSize(); } @@ -137,7 +128,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes public void testReplicatedTransactionalNearEvictionMaxSize() throws Exception { atomicityMode = TRANSACTIONAL; cacheMode = REPLICATED; - memMode = ONHEAP_TIERED; checkNearEvictionMaxSize(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 711908b..482d275 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -110,8 +110,6 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs cfg.setExpiryPolicyFactory(factory); - cfg.setMemoryMode(memoryMode()); - if (disableEagerTtl) cfg.setEagerTtl(false); @@ -119,13 +117,6 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } /** - * @return Cache memory mode. - */ - protected CacheMemoryMode memoryMode() { - return CacheMemoryMode.ONHEAP_TIERED; - } - - /** * @throws Exception if failed. */ public void testCreateUpdate0() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java deleted file mode 100644 index 4a4981d..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java +++ /dev/null @@ -1,627 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache.local; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; -import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; - -/** - * - */ -public class LocalCacheOffHeapAndSwapMetricsSelfTest extends GridCommonAbstractTest { - /** Grid count. */ - private static final int GRID_CNT = 1; - - /** Keys count. */ - private static final int KEYS_CNT = 1000; - - /** Max size. */ - private static final int MAX_SIZE = 100; - - /** Entry size. */ - private static final int ENTRY_SIZE = 86; // Calculated as allocated size divided on entries count. - - /** Offheap max count. */ - private static final int OFFHEAP_MAX_CNT = KEYS_CNT / 2; - - /** Offheap max size. */ - private static final int OFFHEAP_MAX_SIZE = ENTRY_SIZE * OFFHEAP_MAX_CNT; - - /** Cache. */ - private IgniteCache<Integer, Integer> cache; - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - - return cfg; - } - - /** - * @param memoryMode Cache memory mode. - * @param offHeapSize Max off-heap size. - * @param swapEnabled Swap enabled. - */ - private void createCache(CacheMemoryMode memoryMode, int offHeapSize, boolean swapEnabled) { - CacheConfiguration ccfg = defaultCacheConfiguration(); - - ccfg.setStatisticsEnabled(true); - - ccfg.setCacheMode(CacheMode.LOCAL); - ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC); - ccfg.setMemoryMode(memoryMode); - - ccfg.setOffHeapMaxMemory(offHeapSize); - - ccfg.setEvictionPolicy(new FifoEvictionPolicy(MAX_SIZE)); - - cache = grid(0).getOrCreateCache(ccfg); - } - - /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - super.beforeTestsStarted(); - - startGrids(GRID_CNT); - } - - /** {@inheritDoc} */ - @Override protected void afterTestsStopped() throws Exception { - super.afterTestsStopped(); - - stopAllGrids(); - } - - /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { - if (cache != null) - cache.destroy(); - } - - /** - * @throws Exception if failed. - */ - public void testOffHeapMetrics() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536";); - - createCache(CacheMemoryMode.ONHEAP_TIERED, 0, false); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapGets()); - assertEquals(0, cache.localMetrics().getOffHeapHits()); - assertEquals(0f, cache.localMetrics().getOffHeapHitPercentage()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses()); - assertEquals(100f, cache.localMetrics().getOffHeapMissPercentage()); - assertEquals(0, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(0, cache.localMetrics().getOffHeapEvictions()); - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapHits()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(0, cache.localMetrics().getOffHeapEvictions()); - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapHits()); - assertEquals(100 / 3.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses()); - assertEquals(100 - (100 / 3.0), cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(0, cache.localMetrics().getOffHeapEvictions()); - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 4 - MAX_SIZE, cache.localMetrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getOffHeapHits()); - assertEquals(100 * (KEYS_CNT * 2.0 - MAX_SIZE) / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses()); - assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(0, cache.localMetrics().getOffHeapEvictions()); - assertEquals(0, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - } - - /** - * @throws Exception if failed. - */ - public void testSwapMetrics() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536";); - - createCache(CacheMemoryMode.ONHEAP_TIERED, -1, true); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapPuts()); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapGets()); - assertEquals(0, cache.localMetrics().getSwapHits()); - assertEquals(0f, cache.localMetrics().getSwapHitPercentage()); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapMisses()); - assertEquals(100f, cache.localMetrics().getSwapMissPercentage()); - assertEquals(0, cache.localMetrics().getSwapRemovals()); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapPuts()); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapGets()); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapHits()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapMisses()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapRemovals()); - - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getSwapEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapPuts()); - assertEquals(KEYS_CNT * 3, cache.localMetrics().getSwapGets()); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapHits()); - assertEquals(100 / 3.0, cache.localMetrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapMisses()); - assertEquals(100 - (100 / 3.0), cache.localMetrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapRemovals()); - - assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getSwapEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapPuts()); - assertEquals(KEYS_CNT * 4 - MAX_SIZE, cache.localMetrics().getSwapGets()); - assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getSwapHits()); - assertEquals(100 * (KEYS_CNT * 2.0 - MAX_SIZE) / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapMisses()); - assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getSwapRemovals()); - - assertEquals(0, cache.localMetrics().getSwapEntriesCount()); - } - - /** - * @throws Exception if failed. - */ - public void testOffHeapAndSwapMetrics() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536";); - - createCache(CacheMemoryMode.ONHEAP_TIERED, OFFHEAP_MAX_SIZE, true); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapGets()); - assertEquals(0, cache.localMetrics().getOffHeapHits()); - assertEquals(0f, cache.localMetrics().getOffHeapHitPercentage()); - assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses()); - assertEquals(100f, cache.localMetrics().getOffHeapMissPercentage()); - assertEquals(0, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(KEYS_CNT - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapPuts()); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapGets()); - assertEquals(0, cache.localMetrics().getSwapHits()); - assertEquals(0f, cache.localMetrics().getSwapHitPercentage()); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapMisses()); - assertEquals(100f, cache.localMetrics().getSwapMissPercentage()); - assertEquals(0, cache.localMetrics().getSwapRemovals()); - - assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapGets()); - assertEquals(0, cache.localMetrics().getOffHeapHits()); - assertEquals(0.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses()); - assertEquals(100.0, cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapPuts()); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapGets()); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapHits()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapMisses()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapRemovals()); - - assertEquals(KEYS_CNT - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapGets()); - assertEquals(0, cache.localMetrics().getOffHeapHits()); - assertEquals(0.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapMisses()); - assertEquals(100.0, cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapPuts()); - assertEquals(KEYS_CNT * 3, cache.localMetrics().getSwapGets()); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapHits()); - assertEquals(100 / 3.0, cache.localMetrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapMisses()); - assertEquals(100 - (100 / 3.0), cache.localMetrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.localMetrics().getSwapRemovals()); - - assertEquals(KEYS_CNT - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 4 - MAX_SIZE, cache.localMetrics().getOffHeapGets()); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapHits()); - assertEquals(100 * OFFHEAP_MAX_CNT / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 4 - OFFHEAP_MAX_CNT - MAX_SIZE, cache.localMetrics().getOffHeapMisses()); - assertEquals(100 * (KEYS_CNT * 4 - OFFHEAP_MAX_CNT - MAX_SIZE) / (KEYS_CNT * 4.0 - MAX_SIZE), - cache.localMetrics().getOffHeapMissPercentage(), 0.1); - assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapRemovals()); - - assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions()); - assertEquals(0, cache.localMetrics().getOffHeapEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount()); - - assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapPuts()); - assertEquals(KEYS_CNT * 4 - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapGets()); - assertEquals(KEYS_CNT * 2 - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapHits()); - assertEquals(100 * (KEYS_CNT * 2.0 - MAX_SIZE - OFFHEAP_MAX_CNT) / (KEYS_CNT * 4.0 - MAX_SIZE - OFFHEAP_MAX_CNT), - cache.localMetrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapMisses()); - assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - MAX_SIZE - OFFHEAP_MAX_CNT), - cache.localMetrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT * 2 - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapRemovals()); - - assertEquals(0, cache.localMetrics().getSwapEntriesCount()); - } - - /** - * @throws Exception if failed. - */ - public void testOffHeapMetricsInOffHeapTiered() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536";); - -// createCache(CacheMemoryMode.OFFHEAP_TIERED, 0, false); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPuts()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapGets()); - assertEquals(0, cache.metrics().getOffHeapHits()); - assertEquals(0f, cache.metrics().getOffHeapHitPercentage()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses()); - assertEquals(100f, cache.metrics().getOffHeapMissPercentage()); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(0, cache.metrics().getOffHeapEvictions()); - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapEntriesCount()); - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapHits()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(0, cache.metrics().getOffHeapEvictions()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapHits()); - assertEquals(100 / 3.0, cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses()); - assertEquals(100 - (100 / 3.0), cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(0, cache.metrics().getOffHeapEvictions()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 4, cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapHits()); - assertEquals(100 * (KEYS_CNT * 2.0) / (KEYS_CNT * 4.0), - cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses()); - assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0), - cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapRemovals()); - - assertEquals(0, cache.metrics().getOffHeapEvictions()); - assertEquals(0, cache.metrics().getOffHeapEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - } - - /** - * @throws Exception if failed. - */ - public void testOffHeapAndSwapMetricsInOffHeapTiered() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-4536";); - -// createCache(CacheMemoryMode.OFFHEAP_TIERED, OFFHEAP_MAX_SIZE, true); - - for (int i = 0; i < KEYS_CNT; i++) - cache.put(i, i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapGets()); - assertEquals(0, cache.metrics().getOffHeapHits()); - assertEquals(0f, cache.metrics().getOffHeapHitPercentage()); - assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses()); - assertEquals(100f, cache.metrics().getOffHeapMissPercentage()); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(KEYS_CNT - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapPuts()); - assertEquals(KEYS_CNT, cache.metrics().getSwapGets()); - assertEquals(0, cache.metrics().getSwapHits()); - assertEquals(0f, cache.metrics().getSwapHitPercentage()); - assertEquals(KEYS_CNT, cache.metrics().getSwapMisses()); - assertEquals(100f, cache.metrics().getSwapMissPercentage()); - assertEquals(0, cache.metrics().getSwapRemovals()); - - assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPuts()); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapGets()); - assertEquals(0, cache.metrics().getOffHeapHits()); - assertEquals(0.0, cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses()); - assertEquals(100.0, cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapPuts()); - assertEquals(KEYS_CNT * 2, cache.metrics().getSwapGets()); - assertEquals(KEYS_CNT, cache.metrics().getSwapHits()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.metrics().getSwapMisses()); - assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.metrics().getSwapRemovals()); - - assertEquals(KEYS_CNT - OFFHEAP_MAX_CNT, cache.metrics().getSwapEntriesCount()); - - for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++) - cache.get(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapGets()); - assertEquals(0, cache.metrics().getOffHeapHits()); - assertEquals(0.0, cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapMisses()); - assertEquals(100.0, cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(0, cache.metrics().getOffHeapRemovals()); - - assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT - KEYS_CNT, - cache.metrics().getOffHeapEvictions()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapPuts()); - assertEquals(KEYS_CNT * 3, cache.metrics().getSwapGets()); - assertEquals(KEYS_CNT, cache.metrics().getSwapHits()); - assertEquals(100 / 3.0, cache.metrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.metrics().getSwapMisses()); - assertEquals(100 - (100 / 3.0), cache.metrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT, cache.metrics().getSwapRemovals()); - - assertEquals(KEYS_CNT - OFFHEAP_MAX_CNT, cache.metrics().getSwapEntriesCount()); - - for (int i = 0; i < KEYS_CNT; i++) - cache.remove(i); - - printStat(); - - assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets()); - assertEquals(KEYS_CNT * 4, cache.metrics().getOffHeapGets()); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapHits()); - assertEquals(100 * OFFHEAP_MAX_CNT / (KEYS_CNT * 4.0), - cache.metrics().getOffHeapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 4 - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapMisses()); - assertEquals(100 * (KEYS_CNT * 4 - OFFHEAP_MAX_CNT) / (KEYS_CNT * 4.0), - cache.metrics().getOffHeapMissPercentage(), 0.1); - assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapRemovals()); - - assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT - 2 * KEYS_CNT, cache.metrics().getOffHeapEvictions()); - assertEquals(0, cache.metrics().getOffHeapEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapPrimaryEntriesCount()); - assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount()); - - assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapPuts()); - assertEquals(KEYS_CNT * 4 - OFFHEAP_MAX_CNT, cache.metrics().getSwapGets()); - assertEquals(KEYS_CNT * 2 - OFFHEAP_MAX_CNT, cache.metrics().getSwapHits()); - assertEquals(100 * (KEYS_CNT * 2.0 - OFFHEAP_MAX_CNT) / (KEYS_CNT * 4.0 - OFFHEAP_MAX_CNT), - cache.metrics().getSwapHitPercentage(), 0.1); - assertEquals(KEYS_CNT * 2, cache.metrics().getSwapMisses()); - assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - OFFHEAP_MAX_CNT), - cache.metrics().getSwapMissPercentage(), 0.1); - assertEquals(KEYS_CNT * 2 - OFFHEAP_MAX_CNT, cache.metrics().getSwapRemovals()); - - assertEquals(0, cache.metrics().getSwapEntriesCount()); - } - - /** - * Prints stats. - */ - protected void printStat() { - System.out.println("!!! -------------------------------------------------------"); - System.out.println("!!! Puts: cache = " + cache.localMetrics().getCachePuts() + - ", offheap = " + cache.localMetrics().getOffHeapPuts() + - ", swap = " + cache.localMetrics().getSwapPuts()); - System.out.println("!!! Gets: cache = " + cache.localMetrics().getCacheGets() + - ", offheap = " + cache.localMetrics().getOffHeapGets() + - ", swap = " + cache.localMetrics().getSwapGets()); - System.out.println("!!! Removes: cache = " + cache.localMetrics().getCacheRemovals() + - ", offheap = " + cache.localMetrics().getOffHeapRemovals() + - ", swap = " + cache.localMetrics().getSwapRemovals()); - System.out.println("!!! Evictions: cache = " + cache.localMetrics().getCacheEvictions() + - ", offheap = " + cache.localMetrics().getOffHeapEvictions() + - ", swap = none" ); - System.out.println("!!! Hits: cache = " + cache.localMetrics().getCacheHits() + - ", offheap = " + cache.localMetrics().getOffHeapHits() + - ", swap = " + cache.localMetrics().getSwapHits()); - System.out.println("!!! Hit(%): cache = " + cache.localMetrics().getCacheHitPercentage() + - ", offheap = " + cache.localMetrics().getOffHeapHitPercentage() + - ", swap = " + cache.localMetrics().getSwapHitPercentage()); - System.out.println("!!! Misses: cache = " + cache.localMetrics().getCacheMisses() + - ", offheap = " + cache.localMetrics().getOffHeapMisses() + - ", swap = " + cache.localMetrics().getSwapMisses()); - System.out.println("!!! Miss(%): cache = " + cache.localMetrics().getCacheMissPercentage() + - ", offheap = " + cache.localMetrics().getOffHeapMissPercentage() + - ", swap = " + cache.localMetrics().getSwapMissPercentage()); - System.out.println("!!! Entries: cache = " + cache.localMetrics().getSize() + - ", offheap = " + cache.localMetrics().getOffHeapEntriesCount() + - ", swap = " + cache.localMetrics().getSwapEntriesCount()); - System.out.println("!!! Size: cache = none" + - ", offheap = " + cache.localMetrics().getOffHeapAllocatedSize() + - ", swap = " + cache.localMetrics().getSwapSize()); - System.out.println(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java index 0b65ab3..612043f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java @@ -24,7 +24,6 @@ import javax.cache.event.CacheEntryListenerException; import javax.cache.event.CacheEntryUpdatedListener; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cache.query.QueryCursor; http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java index 45c1f78..22b8653 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java @@ -35,7 +35,6 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.CacheEntryProcessor; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cache.query.ContinuousQuery; http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java index 0b85375..9f5cfd5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java @@ -39,7 +39,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.CacheEntryProcessor; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.query.ContinuousQuery; http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java index 02d72b8..9eb56dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; @@ -31,10 +30,9 @@ public class CacheKeepBinaryIterationNearEnabledTest extends CacheKeepBinaryIter @Override protected CacheConfiguration<Object, Object> cacheConfiguration( CacheMode cacheMode, int backups, - CacheAtomicityMode atomicityMode, - CacheMemoryMode memoryMode) { + CacheAtomicityMode atomicityMode) { CacheConfiguration<Object, Object> ccfg = - super.cacheConfiguration(cacheMode, backups, atomicityMode, memoryMode); + super.cacheConfiguration(cacheMode, backups, atomicityMode); ccfg.setNearConfiguration(new NearCacheConfiguration<>()); http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java index f345611..f98229d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.store.CacheStoreAdapter; @@ -37,10 +36,9 @@ public class CacheKeepBinaryIterationStoreEnabledTest extends CacheKeepBinaryIte @Override protected CacheConfiguration<Object, Object> cacheConfiguration( CacheMode cacheMode, int backups, - CacheAtomicityMode atomicityMode, - CacheMemoryMode memoryMode) { + CacheAtomicityMode atomicityMode) { CacheConfiguration<Object, Object> ccfg = - super.cacheConfiguration(cacheMode, backups, atomicityMode, memoryMode); + super.cacheConfiguration(cacheMode, backups, atomicityMode); ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 3130b0c..abd7036 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -43,7 +43,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.query.ContinuousQuery; @@ -79,7 +78,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; import static org.apache.ignite.cache.CacheMode.LOCAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -121,7 +119,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); cacheCfg.setLoadPreviousValue(true); - cacheCfg.setMemoryMode(memoryMode()); cfg.setCacheConfiguration(cacheCfg); } @@ -140,13 +137,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } /** - * @return Cache memory mode. - */ - protected CacheMemoryMode memoryMode() { - return ONHEAP_TIERED; - } - - /** * @return Peer class loading enabled flag. */ protected boolean peerClassLoadingEnabled() { http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java index 38d6c7b..4143029 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java @@ -31,7 +31,6 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.Ignition; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.FileSystemConfiguration; @@ -61,7 +60,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC; @@ -166,9 +164,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest { /** Dual mode flag. */ protected final boolean dual; - /** Memory mode. */ - protected final CacheMemoryMode memoryMode; - /** IP finder for primary topology. */ protected final TcpDiscoveryVmIpFinder primaryIpFinder = new TcpDiscoveryVmIpFinder(true); @@ -196,18 +191,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest { * @param mode IGFS mode. */ protected IgfsAbstractBaseSelfTest(IgfsMode mode) { - this(mode, ONHEAP_TIERED); - } - - /** - * Constructor. - * - * @param mode IGFS mode. - * @param memoryMode Memory mode. - */ - protected IgfsAbstractBaseSelfTest(IgfsMode mode, CacheMemoryMode memoryMode) { this.mode = mode; - this.memoryMode = memoryMode; dual = (mode == DUAL_SYNC || mode == DUAL_ASYNC); } @@ -396,7 +380,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest { dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2)); dataCacheCfg.setBackups(0); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); - dataCacheCfg.setMemoryMode(memoryMode); dataCacheCfg.setOffHeapMaxMemory(0); CacheConfiguration metaCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/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 0e776b1..f3d6db6 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 @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.igfs; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException; import org.apache.ignite.igfs.IgfsException; @@ -79,16 +78,6 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest { } /** - * Constructor. - * - * @param mode IGFS mode. - * @param memoryMode Memory mode. - */ - protected IgfsAbstractSelfTest(IgfsMode mode, CacheMemoryMode memoryMode) { - super(mode, memoryMode); - } - - /** * Test existence check when the path exists both locally and remotely. * * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index dcf0bde..8d50653 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -66,11 +66,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.Ignition; -import org.apache.ignite.cache.CacheMemoryMode; -import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; @@ -1802,79 +1798,6 @@ public final class GridTestUtils { } /** - * Sets cache configuration parameters according to test memory mode. - * - * @param cfg Ignite configuration. - * @param ccfg Cache configuration. - * @param testMode Test memory mode. - * @param maxHeapCnt Maximum number of entries in heap (used if test mode involves eviction from heap). - * @param maxOffheapSize Maximum offheap memory size (used if test mode involves eviction from offheap to swap). - */ - public static void setMemoryMode(IgniteConfiguration cfg, CacheConfiguration ccfg, - TestMemoryMode testMode, - int maxHeapCnt, - long maxOffheapSize) { - assert testMode != null; - assert ccfg != null; - - CacheMemoryMode memMode; - boolean swap = false; - boolean evictionPlc = false; - long offheapMaxMem = -1L; - - switch (testMode) { - case HEAP: { - memMode = CacheMemoryMode.ONHEAP_TIERED; - swap = false; - - break; - } - - case SWAP: { - memMode = CacheMemoryMode.ONHEAP_TIERED; - evictionPlc = true; - swap = true; - - break; - } - - case OFFHEAP_EVICT: { - memMode = CacheMemoryMode.ONHEAP_TIERED; - evictionPlc = true; - offheapMaxMem = 0; - - break; - } - - case OFFHEAP_EVICT_SWAP: { - assert maxOffheapSize > 0 : maxOffheapSize; - - memMode = CacheMemoryMode.ONHEAP_TIERED; - swap = true; - evictionPlc = true; - offheapMaxMem = maxOffheapSize; - - break; - } - - default: - throw new IllegalArgumentException("Invalid mode: " + testMode); - } - - ccfg.setMemoryMode(memMode); - - if (evictionPlc) { - LruEvictionPolicy plc = new LruEvictionPolicy(); - - plc.setMaxSize(maxHeapCnt); - - ccfg.setEvictionPolicy(plc); - } - - ccfg.setOffHeapMaxMemory(offheapMaxMem); - } - - /** * Generate random alphabetical string. * * @param rnd Random object. @@ -1891,23 +1814,4 @@ public final class GridTestUtils { return b.toString(); } - - - /** - * - */ - public enum TestMemoryMode { - /** Heap only. */ - HEAP, - /** Evict from heap to swap with eviction policy. */ - SWAP, - /** Always evict to offheap, no swap. */ - OFFHEAP_TIERED, - /** Always evict to offheap + evict from offheap to swap when max offheap memory limit is reached. */ - OFFHEAP_TIERED_SWAP, - /** Evict to offheap with eviction policy, no swap. */ - OFFHEAP_EVICT, - /** Evict to offheap with eviction policy + evict from offheap to swap when max offheap memory limit is reached. */ - OFFHEAP_EVICT_SWAP, - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java index 1d57898..3368a83 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java @@ -29,7 +29,6 @@ import javax.cache.event.CacheEntryListenerException; import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheInterceptorAdapter; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheRebalanceMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -46,7 +45,6 @@ import org.apache.ignite.configuration.TopologyValidator; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.MapCacheStoreStrategy; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; -import org.apache.ignite.testframework.junits.IgniteCacheConfigVariationsAbstractTest; import static org.apache.ignite.internal.util.lang.GridFunc.asArray; @@ -86,10 +84,6 @@ public class ConfigVariations { ); /** */ - private static final ConfigParameter<Object> ONHEAP_TIERED_MEMORY_PARAM = - Parameters.parameter("setMemoryMode", CacheMemoryMode.ONHEAP_TIERED); - - /** */ private static final ConfigParameter<Object> OFFHEAP_ENABLED = Parameters.parameter("setOffHeapMaxMemory", 10 * 1024 * 1024L); @@ -105,7 +99,6 @@ public class ConfigVariations { private static final ConfigParameter<CacheConfiguration>[][] BASIC_CACHE_SET = new ConfigParameter[][] { Parameters.objectParameters("setCacheMode", CacheMode.REPLICATED, CacheMode.PARTITIONED), Parameters.enumParameters("setAtomicityMode", CacheAtomicityMode.class), - Parameters.enumParameters("setMemoryMode", CacheMemoryMode.class), // Set default parameters. Parameters.objectParameters("setLoadPreviousValue", true), asArray(SIMPLE_CACHE_STORE_PARAM), @@ -119,9 +112,6 @@ public class ConfigVariations { private static final ConfigParameter<CacheConfiguration>[][] FULL_CACHE_SET = new ConfigParameter[][] { Parameters.enumParameters("setCacheMode", CacheMode.class), Parameters.enumParameters("setAtomicityMode", CacheAtomicityMode.class), - asArray(ONHEAP_TIERED_MEMORY_PARAM, - Parameters.complexParameter(ONHEAP_TIERED_MEMORY_PARAM, OFFHEAP_ENABLED) - ), Parameters.booleanParameters("setLoadPreviousValue"), Parameters.booleanParameters("setReadFromBackup"), Parameters.booleanParameters("setStoreKeepBinary"), http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java index e0b24b2..b915f97 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteTransactions; import org.apache.ignite.Ignition; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.configuration.CacheConfiguration; @@ -383,13 +382,6 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf } /** - * @return {@code True} if values should be stored off-heap. - */ - protected CacheMemoryMode memoryMode() { - return cacheConfiguration().getMemoryMode(); - } - - /** * @return {@code True} if store is enabled. */ protected boolean storeEnabled() { http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java index f3dd1c8..ebcf1df 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java @@ -27,7 +27,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMetricsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheAtomicReplicatedMetricsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMetricsSelfTest; -import org.apache.ignite.internal.processors.cache.local.LocalCacheOffHeapAndSwapMetricsSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalMetricsNoStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalMetricsSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalTckMetricsSelfTestImpl; @@ -49,7 +48,6 @@ public class IgniteCacheMetricsSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheReplicatedMetricsSelfTest.class); suite.addTestSuite(GridCachePartitionedMetricsSelfTest.class); suite.addTestSuite(GridCachePartitionedHitsAndMissesSelfTest.class); - suite.addTestSuite(LocalCacheOffHeapAndSwapMetricsSelfTest.class); // Atomic cache. suite.addTestSuite(GridCacheAtomicLocalMetricsSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java index bd41aeb..7706884 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java @@ -28,7 +28,6 @@ import javax.cache.expiry.ModifiedExpiryPolicy; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; @@ -41,7 +40,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; -import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC; /** @@ -53,19 +51,16 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest { /** * @param atomicityMode Atomicity mode. - * @param memoryMode Memory mode. * @param offheapMem Offheap memory size. * @param idx Indexing enabled flag. * @return Cache configuration. */ private CacheConfiguration<String, TestIndexedType> cacheConfiguration(CacheAtomicityMode atomicityMode, - CacheMemoryMode memoryMode, long offheapMem, boolean idx) { CacheConfiguration<String, TestIndexedType> ccfg = new CacheConfiguration<>(); ccfg.setAtomicityMode(atomicityMode); - ccfg.setMemoryMode(memoryMode); ccfg.setOffHeapMaxMemory(offheapMem); ccfg.setBackups(1); ccfg.setAtomicWriteOrderMode(PRIMARY); @@ -96,14 +91,14 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testAtomicIndexEnabled() throws Exception { - concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, ONHEAP_TIERED, 0, true)); + concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, 0, true)); } /** * @throws Exception If failed. */ public void testAtomic() throws Exception { - concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, ONHEAP_TIERED, 0, false)); + concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, 0, false)); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java index b72345f..690fff8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java @@ -30,8 +30,6 @@ import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; - /** * */ @@ -53,7 +51,6 @@ public class CacheQueryOffheapEvictDataLostTest extends GridCommonAbstractTest { CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(); ccfg.setName("cache-1"); - ccfg.setMemoryMode(ONHEAP_TIERED); ccfg.setEvictionPolicy(new LruEvictionPolicy(10)); ccfg.setOffHeapMaxMemory(1024); ccfg.setIndexedTypes(Integer.class, TestData.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java index d76bbf7..5fb0fb8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java @@ -28,7 +28,6 @@ import javax.cache.Cache; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.eviction.EvictionPolicy; import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy; @@ -51,7 +50,6 @@ import org.jetbrains.annotations.Nullable; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -106,7 +104,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe public void testAtomicOffheapEviction() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, ATOMIC, - ONHEAP_TIERED, new LruEvictionPolicy<>(10), false); @@ -119,7 +116,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe public void testAtomicOffheapEvictionIndexing() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, ATOMIC, - ONHEAP_TIERED, new LruEvictionPolicy<>(10), true); @@ -132,7 +128,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe public void testTxOffheapEviction() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, TRANSACTIONAL, - ONHEAP_TIERED, new LruEvictionPolicy<>(10), false); @@ -145,7 +140,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe public void testTxOffheapEvictionIndexing() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, TRANSACTIONAL, - ONHEAP_TIERED, new LruEvictionPolicy<>(10), true); @@ -338,7 +332,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe /** * @param cacheMode Cache mode. * @param atomicityMode Cache atomicity mode. - * @param memoryMode Cache memory mode. * @param evictionPlc Eviction policy. * @param indexing Indexing flag. * @return Cache configuration. @@ -346,14 +339,12 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe private CacheConfiguration<Object, Object> cacheConfiguration( CacheMode cacheMode, CacheAtomicityMode atomicityMode, - CacheMemoryMode memoryMode, @Nullable EvictionPolicy<Object, Object> evictionPlc, boolean indexing) { CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(); ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); - ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setEvictionPolicy(evictionPlc); http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java index 820f223..392cdc7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.QueryIndex; http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java index c61dc0d..17ee024 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java @@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java index 390a090..9d18b62 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java @@ -30,7 +30,6 @@ import java.util.concurrent.ThreadLocalRandom; import javax.cache.Cache; import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.SqlQuery; @@ -103,13 +102,6 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest } /** - * @return Memory mode. - */ - protected CacheMemoryMode memoryMode() { - return CacheMemoryMode.ONHEAP_TIERED; - } - - /** * @param cacheName Cache name. * @return Cache config. */ @@ -124,8 +116,6 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest ccfg.setQueryEntities(Collections.singletonList(person)); - ccfg.setMemoryMode(memoryMode()); - ccfg.setName(cacheName); return ccfg; @@ -178,7 +168,6 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest cfg.setName(cacheName); - cfg.setMemoryMode(memoryMode()); cfg.setIndexedTypes(key, val); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java index cb25c5f..57a8669 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.cache.CacheException; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteInterruptedException; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.query.SqlFieldsQuery; @@ -66,7 +65,6 @@ public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest { cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setBackups(0); - cacheCfg.setMemoryMode(CacheMemoryMode.ONHEAP_TIERED); cacheCfg.setEvictionPolicy(null); cacheCfg.setNearConfiguration(null);
