You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/12 07:33:36 UTC
[05/57] [abbrv] ignite git commit: IGNITE-4535 - Add option to store
deserialized values on-heap
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index 172ca56..6d8b4e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -49,7 +49,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.affinity.Affinity;
import org.apache.ignite.cache.query.CacheQueryEntryEvent;
@@ -80,9 +79,6 @@ import static javax.cache.event.EventType.REMOVED;
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.OFFHEAP_TIERED;
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
-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.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -152,7 +148,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
final CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
ATOMIC,
- ONHEAP_TIERED,
false);
grid(0).createCache(ccfg);
@@ -197,7 +192,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, CLIENT);
@@ -210,7 +204,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, SERVER);
@@ -223,7 +216,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, ALL);
@@ -236,7 +228,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, SERVER);
@@ -249,7 +240,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, ALL);
@@ -262,85 +252,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
ATOMIC,
- ONHEAP_TIERED,
- false);
-
- doTestContinuousQuery(ccfg, CLIENT);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicOffheapValues() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- OFFHEAP_VALUES,
- false);
-
- doTestContinuousQuery(ccfg, SERVER);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicOffheapValuesAllNodes() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- OFFHEAP_VALUES,
- false);
-
- doTestContinuousQuery(ccfg, ALL);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicOffheapValuesClient() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- OFFHEAP_VALUES,
- false);
-
- doTestContinuousQuery(ccfg, CLIENT);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicOffheapTiered() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- OFFHEAP_TIERED,
- false);
-
- doTestContinuousQuery(ccfg, SERVER);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicOffheapTieredAllNodes() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- OFFHEAP_TIERED,
- false);
-
- doTestContinuousQuery(ccfg, ALL);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicOffheapTieredClient() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- OFFHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, CLIENT);
@@ -353,7 +264,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, SERVER);
@@ -366,7 +276,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, ALL);
@@ -379,7 +288,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, CLIENT);
@@ -392,7 +300,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, SERVER);
@@ -405,7 +312,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, ALL);
@@ -418,7 +324,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, SERVER);
@@ -431,7 +336,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestNotModifyOperation(ccfg);
@@ -444,7 +348,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestNotModifyOperation(ccfg);
@@ -457,7 +360,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestNotModifyOperation(ccfg);
@@ -470,33 +372,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
ATOMIC,
- ONHEAP_TIERED,
- true);
-
- doTestNotModifyOperation(ccfg);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testDoubleRemoveAtomicOffheap() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 0,
- ATOMIC,
- OFFHEAP_TIERED,
- false);
-
- doTestNotModifyOperation(ccfg);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testDoubleRemoveAtomicOffheapWithStore() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 0,
- ATOMIC,
- OFFHEAP_TIERED,
true);
doTestNotModifyOperation(ccfg);
@@ -509,7 +384,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestNotModifyOperation(ccfg);
@@ -522,7 +396,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestNotModifyOperation(ccfg);
@@ -535,7 +408,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestNotModifyOperation(ccfg);
@@ -548,7 +420,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestNotModifyOperation(ccfg);
@@ -561,7 +432,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
ATOMIC,
- ONHEAP_TIERED,
false);
doTestNotModifyOperation(ccfg);
@@ -574,7 +444,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
ATOMIC,
- ONHEAP_TIERED,
true);
doTestNotModifyOperation(ccfg);
@@ -856,7 +725,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, CLIENT);
@@ -869,7 +737,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
1,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, CLIENT);
@@ -882,7 +749,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, SERVER);
@@ -895,111 +761,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED,
0,
TRANSACTIONAL,
- ONHEAP_TIERED,
- false);
-
- doTestContinuousQuery(ccfg, CLIENT);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffheapValues() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_VALUES,
- false);
-
- doTestContinuousQuery(ccfg, SERVER);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffheapValuesAllNodes() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_VALUES,
- false);
-
- doTestContinuousQuery(ccfg, ALL);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffheapValuesExplicit() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_VALUES,
- false);
-
- doTestContinuousQuery(ccfg, SERVER);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffheapValuesClient() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_VALUES,
- false);
-
- doTestContinuousQuery(ccfg, CLIENT);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffheapTiered() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_TIERED,
- false);
-
- doTestContinuousQuery(ccfg, SERVER);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffheapTieredAllNodes() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_TIERED,
- false);
-
- doTestContinuousQuery(ccfg, ALL);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffheapTieredClient() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_TIERED,
- false);
-
- doTestContinuousQuery(ccfg, CLIENT);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffheapTieredClientExplicit() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, CLIENT);
@@ -1012,7 +773,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, SERVER);
@@ -1025,7 +785,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, ALL);
@@ -1038,7 +797,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, SERVER);
@@ -1051,7 +809,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
0,
TRANSACTIONAL,
- ONHEAP_TIERED,
false);
doTestContinuousQuery(ccfg, CLIENT);
@@ -1633,7 +1390,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
* @param cacheMode Cache mode.
* @param backups Number of backups.
* @param atomicityMode Cache atomicity mode.
- * @param memoryMode Cache memory mode.
* @param store If {@code true} configures dummy cache store.
* @return Cache configuration.
*/
@@ -1641,14 +1397,12 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
CacheMode cacheMode,
int backups,
CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode,
boolean store) {
CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
ccfg.setName("cache-" + UUID.randomUUID()); // TODO GG-11220 (remove setName when fixed).
ccfg.setAtomicityMode(atomicityMode);
ccfg.setCacheMode(cacheMode);
- ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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/c56c4b8c/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/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
index 72667f6..46df90d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
@@ -22,7 +22,6 @@ import javax.cache.Cache;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.binary.BinaryObject;
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.cache.query.QueryCursor;
@@ -42,8 +41,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
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.OFFHEAP_TIERED;
-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;
@@ -92,27 +89,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAtomicOnHeap() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- ONHEAP_TIERED
- );
-
- doTestScanQuery(ccfg, true, true);
- doTestScanQuery(ccfg, true, false);
- doTestScanQuery(ccfg, false, true);
- doTestScanQuery(ccfg, false, false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicOffHeap() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- OFFHEAP_TIERED
- );
+ CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, ATOMIC);
doTestScanQuery(ccfg, true, true);
doTestScanQuery(ccfg, true, false);
@@ -124,27 +101,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testTxOnHeap() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- ONHEAP_TIERED
- );
-
- doTestScanQuery(ccfg, true, true);
- doTestScanQuery(ccfg, true, false);
- doTestScanQuery(ccfg, false, true);
- doTestScanQuery(ccfg, false, false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffHeap() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_TIERED
- );
+ CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,1, TRANSACTIONAL);
doTestScanQuery(ccfg, true, true);
doTestScanQuery(ccfg, true, false);
@@ -156,27 +113,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAtomicOnHeapLocalEntries() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- ONHEAP_TIERED
- );
-
- doTestLocalEntries(ccfg, true, true);
- doTestLocalEntries(ccfg, true, false);
- doTestLocalEntries(ccfg, false, true);
- doTestLocalEntries(ccfg, false, false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicOffHeapLocalEntries() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- ATOMIC,
- OFFHEAP_TIERED
- );
+ CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, ATOMIC);
doTestLocalEntries(ccfg, true, true);
doTestLocalEntries(ccfg, true, false);
@@ -188,27 +125,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testTxOnHeapLocalEntries() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- ONHEAP_TIERED
- );
-
- doTestLocalEntries(ccfg, true, true);
- doTestLocalEntries(ccfg, true, false);
- doTestLocalEntries(ccfg, false, true);
- doTestLocalEntries(ccfg, false, false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxOffHeapLocalEntries() throws Exception {
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
- 1,
- TRANSACTIONAL,
- OFFHEAP_TIERED
- );
+ CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL);
doTestLocalEntries(ccfg, true, true);
doTestLocalEntries(ccfg, true, false);
@@ -304,9 +221,6 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
cache0 = cache0.withKeepBinary();
for (CachePeekMode mode : CachePeekMode.values()) {
- if (mode == CachePeekMode.SWAP)
- continue;
-
int size = 0;
for (Cache.Entry<Object, Object> e : cache0.localEntries(mode)) {
@@ -332,11 +246,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
if (mode == CachePeekMode.ALL ||
mode == CachePeekMode.PRIMARY ||
mode == CachePeekMode.BACKUP ||
- (mode == CachePeekMode.NEAR && i == 0 &&
- ccfg.getMemoryMode() == CacheMemoryMode.ONHEAP_TIERED &&
- ccfg.getNearConfiguration() != null) ||
- (mode == CachePeekMode.ONHEAP && ccfg.getMemoryMode() == CacheMemoryMode.ONHEAP_TIERED) ||
- (mode == CachePeekMode.OFFHEAP && ccfg.getMemoryMode() == CacheMemoryMode.OFFHEAP_TIERED))
+ (mode == CachePeekMode.NEAR && i == 0 && ccfg.getNearConfiguration() != null))
assertTrue("Zero result at mode: " + mode, size > 0);
}
}
@@ -363,19 +273,16 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
* @param cacheMode Cache mode.
* @param backups Number of backups.
* @param atomicityMode Cache atomicity mode.
- * @param memoryMode Cache memory mode.
* @return Cache configuration.
*/
protected CacheConfiguration<Object, Object> cacheConfiguration(
CacheMode cacheMode,
int backups,
- CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode) {
+ CacheAtomicityMode atomicityMode) {
CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
ccfg.setAtomicityMode(atomicityMode);
ccfg.setCacheMode(cacheMode);
- ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicOffheapTieredTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicOffheapTieredTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicOffheapTieredTest.java
deleted file mode 100644
index d6948e2..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicOffheapTieredTest.java
+++ /dev/null
@@ -1,32 +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.query.continuous;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
-
-/**
- *
- */
-public class GridCacheContinuousQueryAtomicOffheapTieredTest extends GridCacheContinuousQueryAtomicSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return OFFHEAP_TIERED;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicOffheapValuesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicOffheapValuesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicOffheapValuesTest.java
deleted file mode 100644
index 4002435..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicOffheapValuesTest.java
+++ /dev/null
@@ -1,32 +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.query.continuous;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
-
-/**
- *
- */
-public class GridCacheContinuousQueryAtomicOffheapValuesTest extends GridCacheContinuousQueryAtomicSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return OFFHEAP_VALUES;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxOffheapTieredTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxOffheapTieredTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxOffheapTieredTest.java
deleted file mode 100644
index bcba7b6..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxOffheapTieredTest.java
+++ /dev/null
@@ -1,32 +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.query.continuous;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
-
-/**
- *
- */
-public class GridCacheContinuousQueryTxOffheapTieredTest extends GridCacheContinuousQueryTxSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return OFFHEAP_TIERED;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxOffheapValuesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxOffheapValuesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxOffheapValuesTest.java
deleted file mode 100644
index 2994af6..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxOffheapValuesTest.java
+++ /dev/null
@@ -1,32 +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.query.continuous;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
-
-/**
- *
- */
-public class GridCacheContinuousQueryTxOffheapValuesTest extends GridCacheContinuousQueryTxSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return OFFHEAP_VALUES;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryPartitionedAtomicOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryPartitionedAtomicOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryPartitionedAtomicOffHeapSelfTest.java
deleted file mode 100644
index 229cec4..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryPartitionedAtomicOffHeapSelfTest.java
+++ /dev/null
@@ -1,35 +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.version;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- *
- */
-public class CacheVersionedEntryPartitionedAtomicOffHeapSelfTest extends CacheVersionedEntryPartitionedAtomicSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
-
- cfg.setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED);
-
- return cfg;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryPartitionedTransactionalOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryPartitionedTransactionalOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryPartitionedTransactionalOffHeapSelfTest.java
deleted file mode 100644
index d729780..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryPartitionedTransactionalOffHeapSelfTest.java
+++ /dev/null
@@ -1,36 +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.version;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- *
- */
-public class CacheVersionedEntryPartitionedTransactionalOffHeapSelfTest extends
- CacheVersionedEntryPartitionedTransactionalSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
-
- cfg.setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED);
-
- return cfg;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryReplicatedAtomicOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryReplicatedAtomicOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryReplicatedAtomicOffHeapSelfTest.java
deleted file mode 100644
index aa46101..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryReplicatedAtomicOffHeapSelfTest.java
+++ /dev/null
@@ -1,35 +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.version;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- *
- */
-public class CacheVersionedEntryReplicatedAtomicOffHeapSelfTest extends CacheVersionedEntryReplicatedAtomicSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
-
- cfg.setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED);
-
- return cfg;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryReplicatedTransactionalOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryReplicatedTransactionalOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryReplicatedTransactionalOffHeapSelfTest.java
deleted file mode 100644
index c0cc89f..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryReplicatedTransactionalOffHeapSelfTest.java
+++ /dev/null
@@ -1,36 +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.version;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- *
- */
-public class CacheVersionedEntryReplicatedTransactionalOffHeapSelfTest extends
- CacheVersionedEntryReplicatedTransactionalSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
-
- cfg.setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED);
-
- return cfg;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 080902c..ec2aa61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -132,8 +132,6 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setEvictSynchronized(false);
-
if (store != null) {
cc.setCacheStoreFactory(new IgniteReflectionFactory<CacheStore>(TestStore.class));
cc.setReadThrough(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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..55e1905 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,8 +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/c56c4b8c/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/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAtomicPrimaryOffheapTieredSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAtomicPrimaryOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAtomicPrimaryOffheapTieredSelfTest.java
deleted file mode 100644
index 09b4f9e..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAtomicPrimaryOffheapTieredSelfTest.java
+++ /dev/null
@@ -1,39 +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.igfs;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- * Tests for PRIMARY mode.
- */
-public class IgfsAtomicPrimaryOffheapTieredSelfTest extends IgfsPrimaryOffheapTieredSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean fragmentizerEnabled() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override protected void prepareCacheConfigurations(CacheConfiguration dataCacheCfg,
- CacheConfiguration metaCacheCfg) {
- super.prepareCacheConfigurations(dataCacheCfg, metaCacheCfg);
-
- dataCacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAtomicPrimaryOffheapValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAtomicPrimaryOffheapValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAtomicPrimaryOffheapValuesSelfTest.java
deleted file mode 100644
index 8e9965d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAtomicPrimaryOffheapValuesSelfTest.java
+++ /dev/null
@@ -1,39 +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.igfs;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- * Tests for PRIMARY mode.
- */
-public class IgfsAtomicPrimaryOffheapValuesSelfTest extends IgfsPrimaryOffheapValuesSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean fragmentizerEnabled() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override protected void prepareCacheConfigurations(CacheConfiguration dataCacheCfg,
- CacheConfiguration metaCacheCfg) {
- super.prepareCacheConfigurations(dataCacheCfg, metaCacheCfg);
-
- dataCacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
index 32e7e17..9e24ba8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
@@ -121,6 +121,7 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
evictPlc = new IgfsPerBlockLruEvictionPolicy();
dataCacheCfg.setEvictionPolicy(evictPlc);
+ dataCacheCfg.setOnheapCacheEnabled(true);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCacheCfg.setBackups(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
index bfba10a..2e0be3f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
@@ -55,7 +55,6 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOffheapTieredSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOffheapTieredSelfTest.java
deleted file mode 100644
index 21c5017..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOffheapTieredSelfTest.java
+++ /dev/null
@@ -1,33 +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.igfs;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
-import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
-
-/**
- * Tests for PRIMARY mode and OFFHEAP_TIERED memory.
- */
-public class IgfsPrimaryOffheapTieredSelfTest extends IgfsAbstractSelfTest {
- /**
- * Constructor.
- */
- public IgfsPrimaryOffheapTieredSelfTest() {
- super(PRIMARY, OFFHEAP_TIERED);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOffheapValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOffheapValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOffheapValuesSelfTest.java
deleted file mode 100644
index b079186..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsPrimaryOffheapValuesSelfTest.java
+++ /dev/null
@@ -1,33 +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.igfs;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
-import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
-
-/**
- * Tests for PRIMARY mode and OFFHEAP_VALUES memory.
- */
-public class IgfsPrimaryOffheapValuesSelfTest extends IgfsAbstractSelfTest {
- /**
- * Constructor.
- */
- public IgfsPrimaryOffheapValuesSelfTest() {
- super(PRIMARY, OFFHEAP_VALUES);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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 e40ce76..ac98f9c 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
@@ -69,6 +69,7 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest {
plc.setMaxSize(100000);
cacheCfg.setEvictionPolicy(plc);
+ cacheCfg.setOnheapCacheEnabled(true);
cacheCfg.setBackups(1);
cacheCfg.setRebalanceMode(SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 25b1059..c5cea67 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -79,9 +79,9 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
plc.setMaxSize(1000);
cc.setEvictionPolicy(plc);
+ cc.setOnheapCacheEnabled(true);
cc.setBackups(1);
cc.setAffinity(new RendezvousAffinityFunction(true));
- cc.setEvictSynchronized(true);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
index 6402e63..50e5093 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
@@ -45,7 +45,6 @@ import org.apache.ignite.transactions.Transaction;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -139,8 +138,6 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract
cfg.setCacheMode(PARTITIONED);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setBackups(2);
- cfg.setOffHeapMaxMemory(0);
- cfg.setMemoryMode(OFFHEAP_TIERED);
IgniteCache<String, Integer> cache = client.getOrCreateCache(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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 bbed834..eb3bbe0 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;
@@ -1862,96 +1858,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_TIERED: {
- memMode = CacheMemoryMode.OFFHEAP_TIERED;
- offheapMaxMem = 0;
-
- break;
- }
-
- case OFFHEAP_TIERED_SWAP: {
- assert maxOffheapSize > 0 : maxOffheapSize;
-
- memMode = CacheMemoryMode.OFFHEAP_TIERED;
- offheapMaxMem = maxOffheapSize;
- 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.
@@ -1968,23 +1874,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/c56c4b8c/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 1b1fabc..14cdc2a 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,22 +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_TIERED_MEMORY_PARAM =
- Parameters.parameter("setMemoryMode", CacheMemoryMode.OFFHEAP_TIERED);
-
- /** */
- private static final ConfigParameter<Object> OFFHEAP_VALUES_MEMORY_PARAM =
- Parameters.parameter("setMemoryMode", CacheMemoryMode.OFFHEAP_VALUES);
-
- /** */
- private static final ConfigParameter<Object> OFFHEAP_ENABLED =
- Parameters.parameter("setOffHeapMaxMemory", 10 * 1024 * 1024L);
-
- /** */
@SuppressWarnings("unchecked")
private static final ConfigParameter<IgniteConfiguration>[][] BASIC_IGNITE_SET = new ConfigParameter[][] {
Parameters.objectParameters("setMarshaller", Parameters.factory(BinaryMarshaller.class), optimizedMarshallerFactory()),
@@ -113,13 +95,13 @@ 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),
Parameters.objectParameters("setWriteSynchronizationMode", CacheWriteSynchronizationMode.FULL_SYNC),
Parameters.objectParameters("setAtomicWriteOrderMode", CacheAtomicWriteOrderMode.PRIMARY),
Parameters.objectParameters("setStartSize", 1024),
+ Parameters.booleanParameters("setOnheapCacheEnabled")
};
/** */
@@ -127,11 +109,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.complexParameter(OFFHEAP_TIERED_MEMORY_PARAM, OFFHEAP_ENABLED),
- Parameters.complexParameter(OFFHEAP_VALUES_MEMORY_PARAM, OFFHEAP_ENABLED)
- ),
Parameters.booleanParameters("setLoadPreviousValue"),
Parameters.booleanParameters("setReadFromBackup"),
Parameters.booleanParameters("setStoreKeepBinary"),
@@ -153,6 +130,7 @@ public class ConfigVariations {
Parameters.objectParameters("setWriteSynchronizationMode", CacheWriteSynchronizationMode.FULL_SYNC),
Parameters.objectParameters("setAtomicWriteOrderMode", CacheAtomicWriteOrderMode.PRIMARY),
Parameters.objectParameters("setStartSize", 1024),
+ Parameters.booleanParameters("setOnheapCacheEnabled")
};
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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 5d01d79..fa287bd 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;
@@ -43,11 +42,8 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.configvariations.CacheStartMode;
import org.apache.ignite.transactions.Transaction;
-import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
* Abstract class for cache configuration variations tests.
@@ -386,23 +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 swap should happend after localEvict() call.
- */
- protected boolean swapAfterLocalEvict() {
- if (memoryMode() == OFFHEAP_TIERED)
- return false;
-
- return memoryMode() == ONHEAP_TIERED ? (!offheapEnabled() && swapEnabled()) : swapEnabled();
- }
-
- /**
* @return {@code True} if store is enabled.
*/
protected boolean storeEnabled() {
@@ -410,13 +389,6 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
}
/**
- * @return {@code True} if offheap memory is enabled.
- */
- protected boolean offheapEnabled() {
- return cacheConfiguration().getOffHeapMaxMemory() >= 0;
- }
-
- /**
* @return {@code True} if swap is enabled.
*/
protected boolean swapEnabled() {
@@ -513,20 +485,12 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
/**
* @param cache Cache.
- * @return {@code True} if cache has OFFHEAP_TIERED memory mode.
- */
- protected static <K, V> boolean offheapTiered(IgniteCache<K, V> cache) {
- return cache.getConfiguration(CacheConfiguration.class).getMemoryMode() == OFFHEAP_TIERED;
- }
-
- /**
- * @param cache Cache.
* @param key Key.
* @return {@code True} if cache contains given key.
* @throws Exception If failed.
*/
@SuppressWarnings("unchecked")
protected static boolean containsKey(IgniteCache cache, Object key) throws Exception {
- return offheapTiered(cache) ? cache.localPeek(key, CachePeekMode.OFFHEAP) != null : cache.containsKey(key);
+ return cache.containsKey(key);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index e10bebe..9e46040 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -715,7 +715,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
* @param c Cache proxy.
*/
protected void printPartitionState(IgniteCache<?, ?> c) {
- printPartitionState(c.getConfiguration(CacheConfiguration.class).getName(),0);
+ printPartitionState(c.getConfiguration(CacheConfiguration.class).getName(), 0);
}
/**
@@ -1151,6 +1151,14 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
}
/**
+ * @param cache Cache.
+ * @param key Key.
+ */
+ protected static <K, V> V localPeekOnHeap(GridCacheAdapter<K, V> cache, K key) throws IgniteCheckedException {
+ return cache.localPeek(key, new CachePeekMode[] {CachePeekMode.ONHEAP}, null);
+ }
+
+ /**
* @param comp Compute.
* @param task Task.
* @param arg Task argument.
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
index d237345..93f0168 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
@@ -41,7 +41,7 @@ public class ConfigVariationsTestSuiteBuilderTest extends TestCase {
TestSuite dfltCacheSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
.withBasicCacheParams().build();
- assertEquals(4 * 12, dfltCacheSuite.countTestCases());
+ assertEquals(4 * 4 * 2, dfltCacheSuite.countTestCases());
// With clients.
dfltSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
@@ -52,7 +52,7 @@ public class ConfigVariationsTestSuiteBuilderTest extends TestCase {
dfltCacheSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
.withBasicCacheParams().testedNodesCount(3).withClients().build();
- assertEquals(4 * 12 * 3, dfltCacheSuite.countTestCases());
+ assertEquals(4 * 4 * 2 * 3, dfltCacheSuite.countTestCases());
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 70084f2..0ec0f0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -42,7 +42,6 @@ import org.apache.ignite.internal.processors.cache.GridLocalIgniteSerializationT
import org.apache.ignite.internal.processors.cache.GridProjectionForCachesOnDaemonNodeSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteDaemonNodeMarshallerCacheTest;
import org.apache.ignite.internal.processors.cache.IgniteMarshallerCacheConcurrentReadWriteTest;
-import org.apache.ignite.internal.processors.cache.OffHeapTieredTransactionSelfTest;
import org.apache.ignite.internal.processors.closure.GridClosureProcessorSelfTest;
import org.apache.ignite.internal.processors.closure.GridClosureSerializationTest;
import org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest;
@@ -135,7 +134,6 @@ public class IgniteBasicTestSuite extends TestSuite {
suite.addTestSuite(GridLifecycleAwareSelfTest.class);
suite.addTestSuite(GridMessageListenSelfTest.class);
suite.addTestSuite(GridFailFastNodeFailureDetectionSelfTest.class);
- suite.addTestSuite(OffHeapTieredTransactionSelfTest.class);
suite.addTestSuite(IgniteSlowClientDetectionSelfTest.class);
GridTestUtils.addTestIfNeeded(suite, IgniteDaemonNodeMarshallerCacheTest.class, ignoredTests);
suite.addTestSuite(IgniteMarshallerCacheConcurrentReadWriteTest.class);