http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java index a8cd7e3..891e4ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -30,13 +28,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; */ public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest extends GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest { - /** - * @return Write order mode for atomic cache. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; @@ -61,8 +52,6 @@ public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); - return ccfg; } }
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java index 3548edb..15497f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java @@ -17,13 +17,11 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** @@ -41,11 +39,6 @@ public class GridCacheAtomicNearRemoveFailureTest extends GridCacheAbstractRemov } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearCache() { return new NearCacheConfiguration(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java index 55374d1..c194eb0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java @@ -17,25 +17,16 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * Tests partitioned cache with values being stored off-heap. */ public class GridCacheAtomicOffHeapFullApiSelfTest extends GridCachePartitionedOffHeapFullApiSelfTest { - /** - * @return Write order mode for atomic cache. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; @@ -60,8 +51,6 @@ public class GridCacheAtomicOffHeapFullApiSelfTest extends GridCachePartitionedO @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); - return ccfg; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java index d854fce..d973144 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -30,13 +28,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; */ public class GridCacheAtomicOffHeapMultiNodeFullApiSelfTest extends GridCachePartitionedOffHeapMultiNodeFullApiSelfTest { - /** - * @return Write order mode for atomic cache. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; @@ -61,8 +52,6 @@ public class GridCacheAtomicOffHeapMultiNodeFullApiSelfTest extends @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); - return ccfg; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java index b5cb0e1..c647fdb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractMetricsSelfTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -42,7 +41,6 @@ public class GridCacheAtomicPartitionedMetricsSelfTest extends GridCacheAbstract cfg.setRebalanceMode(SYNC); cfg.setWriteSynchronizationMode(FULL_SYNC); cfg.setAtomicityMode(ATOMIC); - cfg.setAtomicWriteOrderMode(PRIMARY); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java index d8b5dfe..53b3349 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java @@ -17,16 +17,8 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * Multi-node tests for atomic cache with primary write order mode. */ public class GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest extends GridCacheAtomicMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java index 4adda3c..66c18b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java @@ -17,17 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * Multi-node tests for partitioned cache with primary write order. */ public class GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest extends GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java index f6e7e2f..bee025b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java @@ -17,13 +17,11 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** @@ -41,11 +39,6 @@ public class GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest extends GridC } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearCache() { return new NearCacheConfiguration(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java index dbb461f..5b6a927 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java @@ -17,16 +17,8 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * Tests partitioned cache with values being stored off-heap and with primary write order. */ public class GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest extends GridCacheAtomicOffHeapFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java index e49c60b..5fe1efb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java @@ -17,17 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * Tests partitioned cache with values being stored off-heap and with primary write order. */ public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest extends GridCacheAtomicOffHeapMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java index df59436..e64d0ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java @@ -33,7 +33,6 @@ 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.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -60,7 +59,6 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { cc.setBackups(1); cc.setRebalanceMode(SYNC); cc.setAtomicityMode(atomicityMode()); - cc.setAtomicWriteOrderMode(PRIMARY); NearCacheConfiguration nearCfg = new NearCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index 73a5015..3789873 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -50,7 +50,6 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_LOCKED; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNLOCKED; @@ -110,7 +109,6 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio CacheConfiguration cfg = super.cacheConfiguration(gridName); cfg.setWriteSynchronizationMode(FULL_SYNC); - cfg.setAtomicWriteOrderMode(PRIMARY); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java index 5f68e92..fdafd42 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java @@ -22,7 +22,6 @@ import java.util.TreeMap; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; @@ -33,7 +32,6 @@ 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.CacheMode.PARTITIONED; @@ -66,25 +64,23 @@ public class NearCacheSyncUpdateTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testNearCacheSyncUpdateAtomic() throws Exception { - nearCacheSyncUpdateTx(ATOMIC, PRIMARY); + nearCacheSyncUpdateTx(ATOMIC); } /** * @throws Exception If failed. */ public void testNearCacheSyncUpdateTx() throws Exception { - nearCacheSyncUpdateTx(TRANSACTIONAL, null); + nearCacheSyncUpdateTx(TRANSACTIONAL); } /** * @param atomicityMode Atomicity mode. - * @param writeOrderMode Write order mode. * @throws Exception If failed. */ - private void nearCacheSyncUpdateTx(CacheAtomicityMode atomicityMode, - CacheAtomicWriteOrderMode writeOrderMode) throws Exception { + private void nearCacheSyncUpdateTx(CacheAtomicityMode atomicityMode) throws Exception { final IgniteCache<Integer, Integer> cache = - ignite(0).createCache(cacheConfiguration(atomicityMode, writeOrderMode)); + ignite(0).createCache(cacheConfiguration(atomicityMode)); try { final AtomicInteger idx = new AtomicInteger(); @@ -140,18 +136,15 @@ public class NearCacheSyncUpdateTest extends GridCommonAbstractTest { /** * @param atomicityMode Atomicity mode. - * @param writeOrderMode Write order mode. * @return Cache configuration. */ - private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode, - CacheAtomicWriteOrderMode writeOrderMode) { + private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode) { CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(); ccfg.setCacheMode(PARTITIONED); ccfg.setBackups(1); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setAtomicityMode(atomicityMode); - ccfg.setAtomicWriteOrderMode(writeOrderMode); ccfg.setNearConfiguration(new NearCacheConfiguration<Integer, Integer>()); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java index 62fc5e9..07e54d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java @@ -60,7 +60,6 @@ import org.apache.ignite.services.ServiceContext; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** @@ -158,7 +157,6 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest { cfg.setCacheMode(CacheMode.PARTITIONED); cfg.setName(TEST_CACHE_NAME); cfg.setAffinity(new RendezvousAffinityFunction(true /* machine-safe */, 271)); - cfg.setAtomicWriteOrderMode(PRIMARY); cfg.setBackups(1); cfg.setRebalanceMode(CacheRebalanceMode.SYNC); cfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java index 68f5119..4ceab8a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Map; import org.apache.ignite.Ignite; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheRebalanceMode; @@ -53,7 +52,6 @@ public class GridCacheRebalancingPartitionDistributionTest extends GridRollingRe .setCacheMode(CacheMode.PARTITIONED) .setBackups(1) .setAffinity(new RendezvousAffinityFunction(true /* machine-safe */, 271)) - .setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY) .setRebalanceMode(CacheRebalanceMode.SYNC) .setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java index fb995b5..3da266b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractMetricsSelfTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -37,7 +36,6 @@ public class GridCacheAtomicReplicatedMetricsSelfTest extends GridCacheAbstractM cfg.setCacheMode(REPLICATED); cfg.setAtomicityMode(ATOMIC); - cfg.setAtomicWriteOrderMode(PRIMARY); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java index 92670d7..7a157ed 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java @@ -17,24 +17,15 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.CacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * Multi-node tests for replicated atomic cache. */ public class GridCacheReplicatedAtomicMultiNodeFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest { - /** - * @return Write order mode for atomic cache. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; @@ -54,8 +45,6 @@ public class GridCacheReplicatedAtomicMultiNodeFullApiSelfTest extends GridCache @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); - return ccfg; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java index 9c4c77a..bc67554 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java @@ -17,17 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * Multi-node tests for replicated atomic cache with primary write order. */ public class GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest extends GridCacheReplicatedAtomicMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java index ba2a1db..9871315 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.expiry; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -46,11 +44,6 @@ public class IgniteCacheAtomicExpiryPolicyTest extends IgniteCacheExpiryPolicyAb } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearConfiguration() { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java index e214273..1898c3b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java @@ -17,11 +17,9 @@ package org.apache.ignite.internal.processors.cache.expiry; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -43,9 +41,4 @@ public class IgniteCacheAtomicExpiryPolicyWithStoreTest extends IgniteCacheExpir @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java index 7ba2cf0..2761f5e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java @@ -17,16 +17,8 @@ package org.apache.ignite.internal.processors.cache.expiry; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * */ public class IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest extends IgniteCacheAtomicExpiryPolicyTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index ad7151f..981f314 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -59,7 +59,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -878,7 +877,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs IgniteCache<Integer, Integer> cache1 = jcache(1); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) + if (atomicityMode() == ATOMIC) Thread.sleep(100); // Update from another node. @@ -886,7 +885,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs checkTtl(key, 61_000L); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) + if (atomicityMode() == ATOMIC) Thread.sleep(100); // Update from another node with provided TTL. @@ -901,7 +900,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs checkTtl(key, 60_000L); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) + if (atomicityMode() == ATOMIC) Thread.sleep(100); // Update from near node with provided TTL. @@ -930,7 +929,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs for (Integer key : vals.keySet()) checkTtl(key, 60_000L); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) + if (atomicityMode() == ATOMIC) Thread.sleep(100); IgniteCache<Integer, Integer> cache1 = jcache(1); @@ -941,7 +940,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs for (Integer key : vals.keySet()) checkTtl(key, 61_000L); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) + if (atomicityMode() == ATOMIC) Thread.sleep(100); // Update from another node with provided TTL. @@ -955,7 +954,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs // Try create again. cache0.putAll(vals); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) + if (atomicityMode() == ATOMIC) Thread.sleep(100); // Update from near node with provided TTL. http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java index 273224e..7db288f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.integration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -49,9 +47,4 @@ public class IgniteCacheAtomicLoadAllTest extends IgniteCacheLoadAllAbstractTest @Override protected NearCacheConfiguration nearConfiguration() { return null; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java index ebfe2c2..0e9224e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.integration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -46,11 +44,6 @@ public class IgniteCacheAtomicLoaderWriterTest extends IgniteCacheLoaderWriterAb } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearConfiguration() { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java index e5537aa..6467dbc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.integration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -49,9 +47,4 @@ public class IgniteCacheAtomicNoLoadPreviousValueTest extends IgniteCacheNoLoadP @Override protected NearCacheConfiguration nearConfiguration() { return null; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java index 228d8c3..374bb8e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.integration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -49,9 +47,4 @@ public class IgniteCacheAtomicNoReadThroughTest extends IgniteCacheNoReadThrough @Override protected NearCacheConfiguration nearConfiguration() { return null; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java index 5654273..cd36a66 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.integration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -49,9 +47,4 @@ public class IgniteCacheAtomicNoWriteThroughTest extends IgniteCacheNoWriteThrou @Override protected NearCacheConfiguration nearConfiguration() { return null; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java index 9351d96..cd0b7dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.integration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -49,9 +47,4 @@ public class IgniteCacheAtomicStoreSessionTest extends IgniteCacheStoreSessionAb @Override protected NearCacheConfiguration nearConfiguration() { return null; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java index 0c343ef..68583e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache.integration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -31,9 +29,4 @@ public class IgniteCacheAtomicStoreSessionWriteBehindTest extends IgniteCacheSto @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java index 5eeb993..1c29098 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java @@ -17,15 +17,12 @@ package org.apache.ignite.internal.processors.cache.integration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStore; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - public class IgniteCacheJdbcBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest { /** {@inheritDoc} */ @Override protected CacheStore getStore() { @@ -46,9 +43,4 @@ public class IgniteCacheJdbcBlobStoreNodeRestartTest extends IgniteCacheStoreNod @Override protected NearCacheConfiguration nearConfiguration() { return null; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java index 0ecef84..09f5a3e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractMetricsSelfTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -37,7 +36,6 @@ public class GridCacheAtomicLocalMetricsSelfTest extends GridCacheAbstractMetric cfg.setCacheMode(LOCAL); cfg.setAtomicityMode(ATOMIC); - cfg.setAtomicWriteOrderMode(PRIMARY); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 index 94c8d00..08cb9c7 100644 --- 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 @@ -37,7 +37,6 @@ import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi; 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; @@ -95,8 +94,6 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA ccfg.setAtomicityMode(atomicityMode); - ccfg.setAtomicWriteOrderMode(PRIMARY); - ccfg.setWriteSynchronizationMode(FULL_SYNC); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java index 62fd984..b2047a2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java @@ -17,21 +17,14 @@ package org.apache.ignite.internal.processors.cache.query.continuous; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * */ public class CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest extends CacheContinuousQueryFailoverAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 0605bc8..3e81fc0 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 @@ -56,7 +56,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; 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; @@ -885,7 +884,6 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 1a52909..3a20e97 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 @@ -49,7 +49,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -90,7 +89,6 @@ public class CacheContinuousQueryExecuteInPrimaryTest extends GridCommonAbstract ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(CacheMemoryMode.ONHEAP_TIERED); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); return ccfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 ca0fbb8..545b439 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 @@ -53,7 +53,6 @@ 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.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.CacheEntryProcessor; @@ -107,7 +106,6 @@ import org.apache.ignite.transactions.Transaction; 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; @@ -155,7 +153,6 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC ccfg.setCacheMode(cacheMode()); ccfg.setAtomicityMode(atomicityMode()); - ccfg.setAtomicWriteOrderMode(writeOrderMode()); ccfg.setBackups(backups); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setNearConfiguration(nearCacheConfiguration()); @@ -219,13 +216,6 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC protected abstract CacheAtomicityMode atomicityMode(); /** - * @return Write order mode for atomic cache. - */ - protected CacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } - - /** * @throws Exception If failed. */ public void testFirstFilteredEvent() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java index b3c18a9..88999a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java @@ -17,11 +17,9 @@ package org.apache.ignite.internal.processors.cache.query.continuous; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** @@ -35,11 +33,6 @@ public class CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearCacheConfiguration() { return super.nearCacheConfiguration(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java index e33db45..44fe81a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java @@ -17,22 +17,14 @@ package org.apache.ignite.internal.processors.cache.query.continuous; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * */ public class CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest extends CacheContinuousQueryFailoverAbstractSelfTest { /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { return CacheMode.PARTITIONED; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java index 84c9131..80c65e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache.query.continuous; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheMode; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.REPLICATED; /** @@ -32,9 +30,4 @@ public class CacheContinuousQueryFailoverAtomicReplicatedSelfTest @Override protected CacheMode cacheMode() { return REPLICATED; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java index 0d027a9..161a6b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java @@ -61,7 +61,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -526,7 +525,6 @@ public class CacheContinuousQueryOperationFromCallbackTest extends GridCommonAbs ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); ccfg.setWriteSynchronizationMode(writeMode); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 97f9e0e..e1c0bae 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 @@ -41,7 +41,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; 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; @@ -293,7 +292,6 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 7d975f2..b2e9fb7 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 @@ -60,7 +60,6 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; 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; @@ -621,7 +620,6 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(writeMode); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 a6c33bb..91a1764 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 @@ -76,7 +76,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static javax.cache.event.EventType.CREATED; 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; @@ -1635,7 +1634,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 605181f..c09dd38 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 @@ -39,7 +39,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.config.GridTestProperties; 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; @@ -375,7 +374,6 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java index 55047e9..1bcaba0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache.store; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -31,9 +29,4 @@ public class IgnteCacheClientWriteBehindStoreAtomicTest extends IgnteCacheClient @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java index 45eba6c..9b3fc7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteDataStreamer; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; @@ -31,7 +30,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** @@ -150,23 +148,21 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest { private List<CacheConfiguration<Integer, Integer>> cacheConfigurations() { List<CacheConfiguration<Integer, Integer>> ccfgs = new ArrayList<>(); - ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, PRIMARY, 1, "cache-" + ccfgs.size())); - ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, PRIMARY, 0, "cache-" + ccfgs.size())); - ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, null, 1, "cache-" + ccfgs.size())); - ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, null, 0, "cache-" + ccfgs.size())); + ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, 1, "cache-" + ccfgs.size())); + ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, 0, "cache-" + ccfgs.size())); + ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, 1, "cache-" + ccfgs.size())); + ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, 0, "cache-" + ccfgs.size())); return ccfgs; } /** * @param atomicityMode Cache atomicity mode. - * @param writeOrderMode Cache write order mode. * @param backups Number of backups. * @param name Cache name. * @return Cache configuration. */ private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode, - CacheAtomicWriteOrderMode writeOrderMode, int backups, String name) { CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(); @@ -174,7 +170,6 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest { ccfg.setName(name); ccfg.setAtomicityMode(atomicityMode); ccfg.setBackups(backups); - ccfg.setAtomicWriteOrderMode(writeOrderMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java index 5b446cc..2880d59 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java @@ -37,7 +37,6 @@ 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.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -87,8 +86,7 @@ public class ServicePredicateAccessCacheTest extends GridCommonAbstractTest { .setName("testCache") .setAtomicityMode(ATOMIC) .setCacheMode(REPLICATED) - .setWriteSynchronizationMode(FULL_SYNC) - .setAtomicWriteOrderMode(PRIMARY)); + .setWriteSynchronizationMode(FULL_SYNC)); latch = new CountDownLatch(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 4666581..bcec71a 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 @@ -26,7 +26,6 @@ import javax.cache.event.CacheEntryCreatedListener; import javax.cache.event.CacheEntryEventFilter; import javax.cache.event.CacheEntryListener; 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; @@ -120,7 +119,6 @@ public class ConfigVariations { Parameters.objectParameters("setSwapEnabled", true), asArray(SIMPLE_CACHE_STORE_PARAM), Parameters.objectParameters("setWriteSynchronizationMode", CacheWriteSynchronizationMode.FULL_SYNC), - Parameters.objectParameters("setAtomicWriteOrderMode", CacheAtomicWriteOrderMode.PRIMARY), Parameters.objectParameters("setStartSize", 1024), }; @@ -154,7 +152,6 @@ public class ConfigVariations { ), // Set default parameters. Parameters.objectParameters("setWriteSynchronizationMode", CacheWriteSynchronizationMode.FULL_SYNC), - Parameters.objectParameters("setAtomicWriteOrderMode", CacheAtomicWriteOrderMode.PRIMARY), Parameters.objectParameters("setStartSize", 1024), };
