http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java deleted file mode 100644 index 17632de..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ /dev/null @@ -1,450 +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; - -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import javax.cache.Cache; -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.affinity.Affinity; -import org.apache.ignite.cache.query.ScanQuery; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.lang.IgniteBiPredicate; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.GridTestUtils; -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.CacheMode.PARTITIONED; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; - -/** - * Tests scan query over entries in offheap and swap. - */ -public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonAbstractTest { - /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - - /** */ - protected static final String ATOMIC_PERSON_CACHE_NAME = "atomicPerson"; - - /** */ - protected static final String ATOMIC_PRIMITIVE_CACHE_NAME = "atomicPrimitive"; - - /** */ - protected static final String ATOMIC_BYTREARR_CACHE_NAME = "atomicByteArr"; - - /** */ - protected static final String TRANSACTIONAL_PERSON_CACHE_NAME = "transactionalPerson"; - - /** */ - protected static final String TRANSACTIONAL_PRIMITIVE_CACHE_NAME = "transactionalPrimitive"; - - /** */ - protected static final String TRANSACTIONAL_BYTEARR_CACHE_NAME = "transactionalByteArr"; - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(ipFinder); - - cfg.setDiscoverySpi(disco); - - cfg.setCacheConfiguration( - cacheConfiguration(ATOMIC_PERSON_CACHE_NAME, ATOMIC, Key.class, Person.class), - cacheConfiguration(TRANSACTIONAL_PERSON_CACHE_NAME, TRANSACTIONAL, Key.class, Person.class), - cacheConfiguration(ATOMIC_PRIMITIVE_CACHE_NAME, ATOMIC, String.class, Long.class), - cacheConfiguration(TRANSACTIONAL_PRIMITIVE_CACHE_NAME, TRANSACTIONAL, String.class, Long.class), - cacheConfiguration(ATOMIC_BYTREARR_CACHE_NAME, ATOMIC, Integer.class, byte[].class), - cacheConfiguration(TRANSACTIONAL_BYTEARR_CACHE_NAME, TRANSACTIONAL, Integer.class, byte[].class)); - - return cfg; - } - - /** - * @param name Name. - * @param atomicityMode Atomicity mode. - * @param clsK Class k. - * @param clsV Class v. - * @return Cache configuration. - */ - protected CacheConfiguration cacheConfiguration(String name, CacheAtomicityMode atomicityMode, - Class<?> clsK, Class<?> clsV) { - CacheConfiguration ccfg = new CacheConfiguration(); - - ccfg.setName(name); - - ccfg.setMemoryMode(OFFHEAP_TIERED); - - ccfg.setOffHeapMaxMemory(1024); // Set small offheap size to provoke eviction in swap. - - ccfg.setCacheMode(PARTITIONED); - - ccfg.setAtomicityMode(atomicityMode); - - ccfg.setAtomicWriteOrderMode(PRIMARY); - - ccfg.setWriteSynchronizationMode(FULL_SYNC); - - ccfg.setIndexedTypes(clsK, clsV); - - return ccfg; - } - - /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - startGrids(4); - - awaitPartitionMapExchange(); - } - - /** {@inheritDoc} */ - @Override protected void afterTestsStopped() throws Exception { - stopAllGrids(); - } - - /** - * @throws Exception If failed. - */ - public void testQuery() throws Exception { - checkQuery(grid(0).cache(ATOMIC_PERSON_CACHE_NAME), false); - - checkQuery(grid(0).cache(TRANSACTIONAL_PERSON_CACHE_NAME), false); - - checkQuery(grid(0).cache(ATOMIC_PERSON_CACHE_NAME), true); - - checkQuery(grid(0).cache(TRANSACTIONAL_PERSON_CACHE_NAME), true); - } - - /** - * @param cache Cache. - * @param scanPartitions Scan partitions. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void checkQuery(IgniteCache cache, boolean scanPartitions) throws Exception { - final int ENTRY_CNT = 500; - - Map<Integer, Map<Key, Person>> entries = new HashMap<>(); - - Affinity<Object> aff = ignite(0).affinity(cache.getName()); - - for (int i = 0; i < ENTRY_CNT; i++) { - Key key = new Key(i); - Person val = new Person("p-" + i, i); - - int part = aff.partition(key); - - cache.getAndPut(key, val); - - Map<Key, Person> partEntries = entries.get(part); - - if (partEntries == null) - entries.put(part, partEntries = new HashMap<>()); - - partEntries.put(key, val); - } - - try { - int partitions = scanPartitions ? aff.partitions() : 1; - - for (int i = 0; i < partitions; i++) { - ScanQuery<Key, Person> qry = new ScanQuery<>(new IgniteBiPredicate<Key, Person>() { - @Override public boolean apply(Key key, Person p) { - assertEquals(key.id, (Integer)p.salary); - - return key.id % 2 == 0; - } - }); - - if (scanPartitions) - qry.setPartition(i); - - List<Cache.Entry<Key, Person>> res = cache.query(qry).getAll(); - - if (!scanPartitions) - assertEquals(ENTRY_CNT / 2, res.size()); - - for (Cache.Entry<Key, Person> e : res) { - Key k = e.getKey(); - Person p = e.getValue(); - - assertEquals(k.id, (Integer)p.salary); - assertEquals(0, k.id % 2); - - if (scanPartitions) { - Map<Key, Person> partEntries = entries.get(i); - - assertEquals(p, partEntries.get(k)); - } - } - - qry = new ScanQuery<>(); - - if (scanPartitions) - qry.setPartition(i); - - res = cache.query(qry).getAll(); - - if (!scanPartitions) - assertEquals(ENTRY_CNT, res.size()); - } - - testMultithreaded(cache, ENTRY_CNT / 2); - } - finally { - for (int i = 0; i < ENTRY_CNT; i++) - assertTrue(cache.remove(new Key(i))); - } - } - - /** - * @param cache Cache. - * @param expCnt Expected entries in query result. - * @throws Exception If failed. - */ - private void testMultithreaded(final IgniteCache cache, final int expCnt) throws Exception { - log.info("Starting multithreaded queries."); - - GridTestUtils.runMultiThreaded(new Callable<Void>() { - @SuppressWarnings("unchecked") - @Override public Void call() throws Exception { - ScanQuery<Key, Person> qry = new ScanQuery<>(new IgniteBiPredicate<Key, Person>() { - @Override public boolean apply(Key key, Person p) { - assertEquals(key.id, (Integer)p.salary); - - return key.id % 2 == 0; - } - }); - - for (int i = 0; i < 250; i++) { - List<Cache.Entry<Key, Person>> res = cache.query(qry).getAll(); - - assertEquals(expCnt, res.size()); - - if (i % 50 == 0) - log.info("Iteration " + i); - } - - return null; - } - }, 8, "test"); - } - - /** - * @throws Exception If failed. - */ - public void testQueryPrimitives() throws Exception { - checkQueryPrimitives(grid(0).cache(ATOMIC_PRIMITIVE_CACHE_NAME)); - checkQueryPrimitives(grid(0).cache(TRANSACTIONAL_PRIMITIVE_CACHE_NAME)); - } - - /** - * @param cache Cache. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void checkQueryPrimitives(IgniteCache cache) throws Exception { - final int ENTRY_CNT = 500; - - for (int i = 0; i < ENTRY_CNT; i++) - cache.getAndPut(String.valueOf(i), (long)i); - - try { - ScanQuery<String, Long> qry = new ScanQuery<>(new IgniteBiPredicate<String, Long>() { - @Override public boolean apply(String key, Long val) { - assertEquals(key, String.valueOf(val)); - - return val % 2 == 0; - } - }); - - Collection<Cache.Entry<String, Long>> res = cache.query(qry).getAll(); - - assertEquals(ENTRY_CNT / 2, res.size()); - - for (Cache.Entry<String, Long> e : res) { - String key = e.getKey(); - Long val = e.getValue(); - - assertEquals(key, String.valueOf(val)); - - assertEquals(0, val % 2); - } - - qry = new ScanQuery<>(); - - res = cache.query(qry).getAll(); - - assertEquals(ENTRY_CNT, res.size()); - } - finally { - for (int i = 0; i < ENTRY_CNT; i++) - assertTrue(cache.remove(String.valueOf(i))); - } - } - - /** - * @throws Exception If failed. - */ - public void testQueryValueByteArray() throws Exception { - checkQueryValueByteArray(grid(0).cache(ATOMIC_BYTREARR_CACHE_NAME)); - checkQueryValueByteArray(grid(0).cache(TRANSACTIONAL_BYTEARR_CACHE_NAME)); - } - - /** - * @param cache Cache. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void checkQueryValueByteArray(IgniteCache cache) throws Exception { - final int ENTRY_CNT = 100; - - for (int i = 0; i < ENTRY_CNT; i++) - cache.getAndPut(i, new byte[i]); - - try { - ScanQuery<Integer, byte[]> qry = new ScanQuery<>( - new IgniteBiPredicate<Integer, byte[]>() { - @Override public boolean apply(Integer key, byte[] val) { - assertEquals(key, (Integer)val.length); - - return key % 2 == 0; - } - }); - - Collection<Cache.Entry<Integer, byte[]>> res = cache.query(qry).getAll(); - - assertEquals(ENTRY_CNT / 2, res.size()); - - for (Cache.Entry<Integer, byte[]> e : res) { - Integer key = e.getKey(); - byte[] val = e.getValue(); - - assertEquals(key, (Integer)val.length); - - assertEquals(0, key % 2); - } - - qry = new ScanQuery<>(); - - res = cache.query(qry).getAll(); - - assertEquals(ENTRY_CNT, res.size()); - } - finally { - for (int i = 0; i < ENTRY_CNT; i++) - assertTrue(cache.remove(i)); - } - } - - /** - * - */ - @SuppressWarnings("PublicInnerClass") - public static class Key { - /** */ - @SuppressWarnings("PublicField") - public Integer id; - - /** - * @param id ID. - */ - public Key(Integer id) { - this.id = id; - } - - /** {@inheritDoc} */ - @Override public boolean equals(Object o) { - if (this == o) - return true; - - if (o == null || getClass() != o.getClass()) - return false; - - Key key = (Key)o; - - return id.equals(key.id); - } - - /** {@inheritDoc} */ - @Override public int hashCode() { - return id.hashCode(); - } - } - - /** - * - */ - @SuppressWarnings("PublicInnerClass") - public static class Person { - /** */ - @SuppressWarnings("PublicField") - public String name; - - /** */ - @SuppressWarnings("PublicField") - public int salary; - - /** - * @param name Name. - * @param salary Salary. - */ - public Person(String name, int salary) { - this.name = name; - this.salary = salary; - } - - /** {@inheritDoc} */ - @Override public boolean equals(Object o) { - if (this == o) - return true; - - if (o == null || getClass() != o.getClass()) - return false; - - Person person = (Person)o; - - if (salary != person.salary) - return false; - - return !(name != null ? !name.equals(person.name) : person.name != null); - - } - - /** {@inheritDoc} */ - @Override public int hashCode() { - int res = name != null ? name.hashCode() : 0; - - return 31 * res + salary; - } - } -} \ 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/query/GridCacheSwapScanQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQuerySelfTest.java deleted file mode 100644 index 1e21f0c..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQuerySelfTest.java +++ /dev/null @@ -1,25 +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; - -/** - * - */ -public class GridCacheSwapScanQuerySelfTest extends GridCacheSwapScanQueryAbstractSelfTest { - // No-op. -} \ 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/query/IgniteCacheQueryCacheDestroySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java index dc104ff..dea491c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java @@ -25,7 +25,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.CacheRebalanceMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -129,7 +128,6 @@ public class IgniteCacheQueryCacheDestroySelfTest extends GridCommonAbstractTest cfg.setAtomicityMode(CacheAtomicityMode.ATOMIC) .setCacheMode(CacheMode.PARTITIONED) - .setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED) .setRebalanceMode(CacheRebalanceMode.SYNC) .setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC) .setRebalanceThrottle(100) http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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 f7ceeb8..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; @@ -45,8 +44,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.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.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -128,7 +125,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen * @throws Exception If failed. */ public void testPartition() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, ATOMIC, ONHEAP_TIERED, false)); + checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, ATOMIC, false)); } /** @@ -137,21 +134,21 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen public void testPartitionWithFilter() throws Exception { filterOn.set(true); - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, ATOMIC, ONHEAP_TIERED, true)); + checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, ATOMIC, true)); } /** * @throws Exception If failed. */ public void testPartitionNoBackups() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, ATOMIC, ONHEAP_TIERED, false)); + checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, ATOMIC, false)); } /** * @throws Exception If failed. */ public void testPartitionTx() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, ONHEAP_TIERED, false)); + checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, false)); } /** @@ -160,14 +157,14 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen public void testPartitionTxWithFilter() throws Exception { filterOn.set(true); - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, ONHEAP_TIERED, true)); + checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, true)); } /** * @throws Exception If failed. */ public void testPartitionTxNoBackup() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, ONHEAP_TIERED, false)); + checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, false)); } /** @@ -176,44 +173,21 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen public void testPartitionTxNoBackupWithFilter() throws Exception { filterOn.set(true); - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, ONHEAP_TIERED, true)); - } - - /** - * @throws Exception If failed. - */ - public void testPartitionOffheap() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, ATOMIC, OFFHEAP_TIERED, false)); - } - - /** - * @throws Exception If failed. - */ - public void testPartitionOffheapWithFilter() throws Exception { - filterOn.set(true); - - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, ATOMIC, OFFHEAP_TIERED, true)); - } - - /** - * @throws Exception If failed. - */ - public void testPartitionTxOffheap() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, OFFHEAP_TIERED, false)); + checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, true)); } /** * @throws Exception If failed. */ public void testReplicated() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, ATOMIC, ONHEAP_TIERED, false)); + checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, ATOMIC, false)); } /** * @throws Exception If failed. */ public void testReplicatedTx() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, TRANSACTIONAL, ONHEAP_TIERED, false)); + checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, TRANSACTIONAL, false)); } /** @@ -222,30 +196,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen public void testReplicatedTxWithFilter() throws Exception { filterOn.set(true); - checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, TRANSACTIONAL, ONHEAP_TIERED, true)); - } - - /** - * @throws Exception If failed. - */ - public void testReplicatedOffheap() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, ATOMIC, OFFHEAP_TIERED, false)); - } - - /** - * @throws Exception If failed. - */ - public void testReplicatedTxOffheap() throws Exception { - checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, TRANSACTIONAL, OFFHEAP_TIERED, false)); - } - - /** - * @throws Exception If failed. - */ - public void testReplicatedTxOffheapWithFilter() throws Exception { - filterOn.set(true); - - checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, TRANSACTIONAL, OFFHEAP_TIERED, true)); + checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, TRANSACTIONAL, true)); } /** @@ -293,7 +244,6 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen * @param cacheMode Cache mode. * @param backups Number of backups. * @param atomicityMode Cache atomicity mode. - * @param memoryMode Cache memory mode. * @param filter Filter enabled. * @return Cache configuration. */ @@ -301,12 +251,11 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen CacheMode cacheMode, int backups, CacheAtomicityMode atomicityMode, - CacheMemoryMode memoryMode, boolean filter) { + boolean filter) { CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(); ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); - ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); if (cacheMode == PARTITIONED) http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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 4f398a6..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; @@ -59,9 +58,6 @@ import static java.util.concurrent.TimeUnit.SECONDS; 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; @@ -126,119 +122,84 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr * @throws Exception If failed. */ public void testNonDeadLockInListenerTx() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerTxJCacheApi() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, true); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInListenerTxOffHeap() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, OFFHEAP_TIERED), true, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInListenerTxOffHeapJCacheApi() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, OFFHEAP_TIERED), true, true, true); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInListenerTxOffHeapValues() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, OFFHEAP_VALUES), true, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, true); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerAtomic() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC, ONHEAP_TIERED), true, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerAtomicJCacheApi() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC, ONHEAP_TIERED), true, true, true); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC), true, true, true); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerReplicatedAtomic() throws Exception { - testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC, ONHEAP_TIERED), true, true, false); + testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerReplicatedAtomicJCacheApi() throws Exception { - testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC, ONHEAP_TIERED), true, true, true); + testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC), true, true, true); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerReplicatedAtomicOffHeapValues() throws Exception { - testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC, ONHEAP_TIERED), true, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInListenerAtomicOffHeap() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC, OFFHEAP_TIERED), true, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInListenerAtomicOffHeapValues() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC, OFFHEAP_TIERED), true, true, false); + testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerAtomicWithoutBackup() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC, ONHEAP_TIERED), true, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerAtomicWithoutBackupJCacheApi() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC, ONHEAP_TIERED), true, true, true); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC), true, true, true); } /** * @throws Exception If failed. */ public void testNonDeadLockInListener() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerReplicated() throws Exception { - testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, false); + testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInListenerReplicatedJCacheApi() throws Exception { - testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, true); + testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), true, true, true); } /// @@ -249,105 +210,63 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr * @throws Exception If failed. */ public void testNonDeadLockInFilterTx() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, false); + testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterTxJCacheApi() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, true); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterTxOffHeap() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, OFFHEAP_TIERED), true, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterTxOffHeapJCacheApi() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, OFFHEAP_TIERED), true, true, true); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterTxOffHeapValues() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, OFFHEAP_VALUES), true, true, false); + testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, true); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterAtomic() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC, ONHEAP_TIERED), true, true, false); + testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterAtomicJCacheApi() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC, ONHEAP_TIERED), true, true, true); + testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC), true, true, true); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterReplicatedAtomic() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, ATOMIC, ONHEAP_TIERED), true, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterAtomicOffHeap() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC, OFFHEAP_TIERED), true, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterAtomicOffHeapJCacheApi() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC, OFFHEAP_TIERED), true, true, true); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterAtomicOffHeapValues() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC, OFFHEAP_TIERED), true, true, false); + testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, ATOMIC), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterAtomicWithoutBackup() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 0, ATOMIC, ONHEAP_TIERED), true, true, false); + testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 0, ATOMIC), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilter() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, false); + testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterReplicated() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, false); + testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), true, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterReplicatedJCacheApi() throws Exception { - testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL, ONHEAP_TIERED), true, true, false); + testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), true, true, false); } /// @@ -358,70 +277,42 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr * @throws Exception If failed. */ public void testNonDeadLockInFilterTxSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, ONHEAP_TIERED), false, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterTxOffHeapSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, OFFHEAP_TIERED), false, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterTxOffHeapValuesSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, OFFHEAP_VALUES), false, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), false, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterAtomicSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC, ONHEAP_TIERED), false, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC), false, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterReplicatedAtomicSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC, ONHEAP_TIERED), false, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterAtomicOffHeapSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC, OFFHEAP_TIERED), false, true, false); - } - - /** - * @throws Exception If failed. - */ - public void testNonDeadLockInFilterAtomicOffHeapValuesSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC, OFFHEAP_TIERED), false, true, false); + testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC), false, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterAtomicWithoutBackupSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC, ONHEAP_TIERED), false, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC), false, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, ONHEAP_TIERED), false, true, false); + testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), false, true, false); } /** * @throws Exception If failed. */ public void testNonDeadLockInFilterReplicatedSyncFilter() throws Exception { - testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL, ONHEAP_TIERED), false, true, false); + testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), false, true, false); } /** @@ -872,20 +763,17 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr * @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.setName("test-cache-" + atomicityMode + "-" + cacheMode + "-" + memoryMode + "-" + backups); + ccfg.setName("test-cache-" + atomicityMode + "-" + cacheMode + "-" + backups); 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/CacheContinuousQueryExecuteInPrimaryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java index 1d014ca..bcc58c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; 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.query.ContinuousQuery; import org.apache.ignite.cache.query.QueryCursor; @@ -88,7 +87,6 @@ public class CacheContinuousQueryExecuteInPrimaryTest extends GridCommonAbstract ccfg.setAtomicityMode(cacheAtomicityMode); ccfg.setCacheMode(cacheMode); - ccfg.setMemoryMode(CacheMemoryMode.ONHEAP_TIERED); 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/CacheContinuousQueryFactoryFilterRandomOperationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java index dbaafe1..8713aaf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java @@ -62,7 +62,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.REPLICATED; import static org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFactoryFilterRandomOperationTest.NonSerializableFilter.isAccepted; import static org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryRandomOperationsTest.ContinuousDeploy.CLIENT; @@ -94,7 +93,6 @@ public class CacheContinuousQueryFactoryFilterRandomOperationTest extends CacheC CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 1, ATOMIC, - ONHEAP_TIERED, false); final IgniteCache<Object, Object> cache = grid(0).createCache(ccfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java index f9130ae..36c777b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java @@ -57,7 +57,6 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode; 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.CacheRebalanceMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -108,7 +107,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; -import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.testframework.GridTestUtils.waitForCondition; @@ -161,7 +159,6 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC ccfg.setBackups(backups); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setNearConfiguration(nearCacheConfiguration()); - ccfg.setMemoryMode(memoryMode()); cfg.setCacheConfiguration(ccfg); @@ -171,13 +168,6 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC } /** - * @return Cache memory mode. - */ - protected CacheMemoryMode memoryMode() { - return ONHEAP_TIERED; - } - - /** * @return Async callback flag. */ protected boolean asyncCallback() { http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.java deleted file mode 100644 index cc8590d..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.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.cache.query.continuous; - -import org.apache.ignite.cache.CacheMemoryMode; - -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; - -/** - * - */ -public class CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest - extends CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest { - /** {@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/CacheContinuousQueryFailoverTxOffheapTieredTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverTxOffheapTieredTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverTxOffheapTieredTest.java deleted file mode 100644 index cae06c3..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverTxOffheapTieredTest.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 CacheContinuousQueryFailoverTxOffheapTieredTest extends CacheContinuousQueryFailoverTxSelfTest { - /** {@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/CacheContinuousQueryOperationP2PTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java index 43bf54f..4fa0424 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java @@ -30,7 +30,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; @@ -44,7 +43,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.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; @@ -105,8 +103,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest public void testAtomicClient() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, - ATOMIC, - ONHEAP_TIERED + ATOMIC ); testContinuousQuery(ccfg, true); @@ -118,8 +115,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest public void testAtomic() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, - ATOMIC, - ONHEAP_TIERED + ATOMIC ); testContinuousQuery(ccfg, false); @@ -131,8 +127,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest public void testAtomicReplicated() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, - ATOMIC, - ONHEAP_TIERED + ATOMIC ); testContinuousQuery(ccfg, false); @@ -144,8 +139,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest public void testAtomicReplicatedClient() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, - ATOMIC, - ONHEAP_TIERED + ATOMIC ); testContinuousQuery(ccfg, true); @@ -157,8 +151,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest public void testTx() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, - TRANSACTIONAL, - ONHEAP_TIERED + TRANSACTIONAL ); testContinuousQuery(ccfg, false); @@ -169,8 +162,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest public void testTxClient() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, - TRANSACTIONAL, - ONHEAP_TIERED + TRANSACTIONAL ); testContinuousQuery(ccfg, true); @@ -182,8 +174,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest public void testTxReplicated() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, - TRANSACTIONAL, - ONHEAP_TIERED + TRANSACTIONAL ); testContinuousQuery(ccfg, false); @@ -195,8 +186,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest public void testTxReplicatedClient() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, - TRANSACTIONAL, - ONHEAP_TIERED + TRANSACTIONAL ); testContinuousQuery(ccfg, true); @@ -279,19 +269,16 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest * @param cacheMode Cache mode. * @param backups Number of backups. * @param atomicityMode Cache atomicity mode. - * @param memoryMode Cache memory mode. * @return Cache configuration. */ private 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/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 c5c98cb..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; @@ -64,9 +63,6 @@ import org.apache.ignite.transactions.Transaction; 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; @@ -143,38 +139,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testAtomicOnheapTwoBackup() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - ONHEAP_TIERED, PRIMARY_SYNC); - - doOrderingTest(ccfg, false); - } - - /** - * @throws Exception If failed. - */ - public void testAtomicOffheapTwoBackup() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - OFFHEAP_TIERED, PRIMARY_SYNC); - - doOrderingTest(ccfg, false); - } - - /** - * @throws Exception If failed. - */ - public void testAtomicOffheapValuesTwoBackup() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - OFFHEAP_VALUES, PRIMARY_SYNC); - - doOrderingTest(ccfg, false); - } - - /** - * @throws Exception If failed. - */ - public void testAtomicReplicatedOffheap() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, ATOMIC, - OFFHEAP_TIERED, PRIMARY_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, PRIMARY_SYNC); doOrderingTest(ccfg, false); } @@ -183,8 +148,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testTxOnheapTwoBackup() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, - ONHEAP_TIERED, FULL_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, FULL_SYNC); doOrderingTest(ccfg, false); } @@ -193,8 +157,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testTxOnheapWithoutBackup() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, - ONHEAP_TIERED, PRIMARY_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, PRIMARY_SYNC); doOrderingTest(ccfg, false); } @@ -203,8 +166,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testTxOnheapWithoutBackupFullSync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, - ONHEAP_TIERED, FULL_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, FULL_SYNC); doOrderingTest(ccfg, false); } @@ -215,8 +177,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testAtomicOnheapTwoBackupAsync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - ONHEAP_TIERED, PRIMARY_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, PRIMARY_SYNC); doOrderingTest(ccfg, true); } @@ -225,48 +186,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testAtomicOnheapTwoBackupAsyncFullSync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - ONHEAP_TIERED, FULL_SYNC); - - doOrderingTest(ccfg, true); - } - - /** - * @throws Exception If failed. - */ - public void testAtomicOffheapTwoBackupAsync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - OFFHEAP_TIERED, PRIMARY_SYNC); - - doOrderingTest(ccfg, true); - } - - /** - * @throws Exception If failed. - */ - public void testAtomicOffheapTwoBackupAsyncFullSync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - OFFHEAP_TIERED, FULL_SYNC); - - doOrderingTest(ccfg, true); - } - - /** - * @throws Exception If failed. - */ - public void testAtomicOffheapValuesTwoBackupAsync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - OFFHEAP_VALUES, PRIMARY_SYNC); - - doOrderingTest(ccfg, true); - } - - /** - * @throws Exception If failed. - */ - public void testAtomicOffheapValuesTwoBackupAsyncFullSync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, - OFFHEAP_VALUES, FULL_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, ATOMIC, FULL_SYNC); doOrderingTest(ccfg, true); } @@ -275,8 +195,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testAtomicReplicatedAsync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, ATOMIC, - ONHEAP_TIERED, PRIMARY_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, ATOMIC, PRIMARY_SYNC); doOrderingTest(ccfg, true); } @@ -285,18 +204,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testAtomicReplicatedAsyncFullSync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, ATOMIC, - ONHEAP_TIERED, FULL_SYNC); - - doOrderingTest(ccfg, true); - } - - /** - * @throws Exception If failed. - */ - public void testAtomicReplicatedOffheapAsync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, ATOMIC, - OFFHEAP_TIERED, PRIMARY_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(REPLICATED, 0, ATOMIC, FULL_SYNC); doOrderingTest(ccfg, true); } @@ -305,8 +213,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testAtomicOnheapWithoutBackupAsync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, ATOMIC, - ONHEAP_TIERED, PRIMARY_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, ATOMIC, PRIMARY_SYNC); doOrderingTest(ccfg, true); } @@ -315,8 +222,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testTxOnheapTwoBackupAsync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, - ONHEAP_TIERED, PRIMARY_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, PRIMARY_SYNC); doOrderingTest(ccfg, true); } @@ -325,8 +231,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testTxOnheapAsync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, - ONHEAP_TIERED, PRIMARY_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, PRIMARY_SYNC); doOrderingTest(ccfg, true); } @@ -335,8 +240,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testTxOnheapAsyncFullSync() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, - ONHEAP_TIERED, FULL_SYNC); + CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, FULL_SYNC); doOrderingTest(ccfg, true); } @@ -604,7 +508,6 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes * @param cacheMode Cache mode. * @param backups Number of backups. * @param atomicityMode Cache atomicity mode. - * @param memoryMode Cache memory mode. * @param writeMode Cache write mode. * @return Cache configuration. */ @@ -612,15 +515,13 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes CacheMode cacheMode, int backups, CacheAtomicityMode atomicityMode, - CacheMemoryMode memoryMode, CacheWriteSynchronizationMode writeMode) { CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(); - ccfg.setName("test-cache-" + atomicityMode + "-" + cacheMode + "-" + memoryMode + "-" + memoryMode + "-" - + backups + "-" + UUID.randomUUID()); // TODO GG-11220 (remove setName when fixed). + ccfg.setName("test-cache-" + atomicityMode + "-" + cacheMode + "-" + backups + "-" + UUID.randomUUID()); + // TODO GG-11220 (remove setName when fixed). ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); - ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(writeMode); ccfg.setAtomicWriteOrderMode(PRIMARY);
