http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java index 9891b3b..768f066 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache; -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 IgniteCacheAtomicPrimaryWriteOrderInvokeTest extends IgniteCacheInv } /** {@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/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java index 2833030..d445bf7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java @@ -17,16 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * */ public class IgniteCacheAtomicPrimaryWriteOrderStoreValueTest extends IgniteCacheAtomicStoreValueTest { - /** {@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/IgniteCacheAtomicStoreValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java index 66bdf95..47f0163 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache; -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 IgniteCacheAtomicStoreValueTest extends IgniteCacheStoreValueAbstra } /** {@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/IgniteCacheEntryListenerAtomicTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java index 57be54c..cddb446 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache; -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 IgniteCacheEntryListenerAtomicTest extends IgniteCacheEntryListener } /** {@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/IgniteCacheEntryListenerExpiredEventsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java index d9fdfac..89e785c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java @@ -41,7 +41,6 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; @@ -171,7 +170,6 @@ public class IgniteCacheEntryListenerExpiredEventsTest extends GridCommonAbstrac ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java index 5163d96..4f92b12 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java @@ -35,7 +35,6 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; 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.CacheWriteSynchronizationMode.FULL_SYNC; @@ -113,7 +112,6 @@ public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest { ccfg.setBackups(1); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setAtomicityMode(ATOMIC); - ccfg.setAtomicWriteOrderMode(PRIMARY); checkEntryProcessorCallCount(ccfg, 1); } @@ -123,7 +121,6 @@ public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest { ccfg.setBackups(0); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setAtomicityMode(ATOMIC); - ccfg.setAtomicWriteOrderMode(PRIMARY); checkEntryProcessorCallCount(ccfg, 1); } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java index 294ebea..237fde7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java @@ -46,7 +46,6 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; -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.CacheWriteSynchronizationMode.FULL_SYNC; @@ -342,7 +341,6 @@ public abstract class IgniteCacheInvokeReadThroughAbstractTest extends GridCommo ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); ccfg.setAffinity(new RendezvousAffinityFunction(false, 32)); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setMemoryMode(memoryMode); if (nearCache) http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java index fb2d0de..08b37d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java @@ -24,7 +24,6 @@ import java.io.ObjectOutput; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import javax.cache.CacheException; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.annotations.QuerySqlField; @@ -63,11 +62,6 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTes } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CacheAtomicWriteOrderMode.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/IgniteCacheReadThroughStoreCallTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java index bb092d4..d72c9ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java @@ -45,7 +45,6 @@ import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; -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; @@ -224,7 +223,6 @@ public class IgniteCacheReadThroughStoreCallTest extends GridCommonAbstractTest ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); ccfg.setAffinity(new RendezvousAffinityFunction(false, 32)); - 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/IgniteCacheTxPeekModesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java index f399ca2..21a92a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java @@ -17,11 +17,9 @@ package org.apache.ignite.internal.processors.cache; -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.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -45,11 +43,6 @@ public class IgniteCacheTxPeekModesTest extends IgniteCachePeekModesAbstractTest } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override public void testLocalPeek() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-1839";); } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java index aac7019..6e4bdf9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; @@ -47,11 +46,6 @@ public class IgniteExchangeFutureHistoryTest extends IgniteCacheAbstractTest { } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CacheAtomicWriteOrderMode.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/IgniteTopologyValidatorPartitionedAtomicCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java index 1298607..84beadb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache; -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; /** @@ -40,11 +38,6 @@ public class IgniteTopologyValidatorPartitionedAtomicCacheTest extends IgniteTop } /** {@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/IgniteTopologyValidatorReplicatedAtomicCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java index 460de7f..f48097e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache; -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; /** @@ -40,11 +38,6 @@ public class IgniteTopologyValidatorReplicatedAtomicCacheTest extends IgniteTopo } /** {@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/context/IgniteCacheAtomicExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java index 86f5cff..025d345 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.context; -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; /** @@ -40,11 +38,6 @@ public class IgniteCacheAtomicExecutionContextTest extends IgniteCacheAbstractEx } /** {@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/context/IgniteCachePartitionedExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java index 4d8457e..36d2c2b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.context; -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; /** @@ -40,11 +38,6 @@ public class IgniteCachePartitionedExecutionContextTest extends IgniteCacheAbstr } /** {@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/context/IgniteCacheReplicatedExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java index 3c5f016..c6e57f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.context; -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; /** @@ -40,11 +38,6 @@ public class IgniteCacheReplicatedExecutionContextTest extends IgniteCacheAbstra } /** {@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/context/IgniteCacheTxExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java index b75fda3..680b134 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java @@ -17,12 +17,10 @@ package org.apache.ignite.internal.processors.cache.context; -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.TRANSACTIONAL; /** @@ -40,11 +38,6 @@ public class IgniteCacheTxExecutionContextTest extends IgniteCacheAbstractExecut } /** {@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/distributed/CacheAtomicNearUpdateTopologyChangeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java index d19a1a4..931a22e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java @@ -17,11 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.internal.processors.cache.CacheNearUpdateTopologyChangeAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -32,9 +30,4 @@ public class CacheAtomicNearUpdateTopologyChangeTest extends CacheNearUpdateTopo @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/distributed/CacheLateAffinityAssignmentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java index 70a6723..691c35f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java @@ -92,7 +92,6 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; 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.CacheRebalanceMode.ASYNC; @@ -194,7 +193,6 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { ccfg.setNodeFilter(cacheNodeFilter); ccfg.setAffinity(affinityFunction(null)); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setBackups(0); 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/CacheNearDisabledAtomicInvokeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java index 90427f5..28f2fe0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java @@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicLong; import javax.cache.processor.EntryProcessorException; import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.CacheMode; @@ -69,11 +68,6 @@ public class CacheNearDisabledAtomicInvokeRestartSelfTest extends CacheAbstractR return ATOMIC; } - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CacheAtomicWriteOrderMode.PRIMARY; - } - /** */ @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/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index b3b2317..d275936 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -41,7 +41,6 @@ import javax.cache.Cache; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; @@ -140,13 +139,6 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra } /** - * @return Atomic write order mode. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return null; - } - - /** * @return Number of data nodes. */ protected int dataNodes() { @@ -226,12 +218,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra if (cacheMode() == PARTITIONED) ccfg.setBackups(backups()); - if (atomicityMode() == ATOMIC) { - assert atomicWriteOrderMode() != null; - - ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); - } - else { + if (atomicityMode() != ATOMIC) { if (cacheMode() == PARTITIONED) ccfg.setNearConfiguration(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/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index 13b5b3b..b84e5ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -23,7 +23,6 @@ import java.util.Map; import javax.cache.integration.CompletionListenerFuture; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.affinity.Affinity; @@ -42,7 +41,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ConcurrentHashMap8; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -100,8 +98,6 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid else cc.setCacheStoreFactory(null); - cc.setAtomicWriteOrderMode(atomicWriteOrderMode()); - c.setCacheConfiguration(cc); return c; @@ -122,13 +118,6 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid } /** - * @return Write order mode for atomic cache. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** * @return {@code True} if near cache is enabled. */ protected abstract boolean nearEnabled(); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index f36b060..8fd88ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -47,7 +47,6 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.eclipse.jetty.util.ConcurrentHashSet; -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; @@ -131,7 +130,6 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { ccfg.setCacheMode(cacheMode); ccfg.setAtomicityMode(atomicityMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(BACKUP_CNT); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java index 96dd50c..eeb96c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java @@ -17,21 +17,15 @@ package org.apache.ignite.internal.processors.cache.distributed; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * */ public class IgniteCacheAtomicNodeJoinTest extends IgniteCacheNodeJoinAbstractTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java index 4cd3f5a..3321a2c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java @@ -42,7 +42,7 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteTransactions; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; +import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cache.affinity.AffinityFunction; import org.apache.ignite.cluster.ClusterNode; @@ -91,7 +91,6 @@ import org.apache.ignite.transactions.TransactionIsolation; import org.eclipse.jetty.util.ConcurrentHashSet; 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; @@ -150,31 +149,29 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testAtomicPutAllPrimaryMode() throws Exception { - atomicPut(PRIMARY, true, null); + atomicPut(true, null); } /** * @throws Exception If failed. */ public void testAtomicPutAllNearEnabledPrimaryMode() throws Exception { - atomicPut(PRIMARY, true, new NearCacheConfiguration()); + atomicPut(true, new NearCacheConfiguration()); } /** * @throws Exception If failed. */ public void testAtomicPutPrimaryMode() throws Exception { - atomicPut(PRIMARY, false, null); + atomicPut(false, null); } /** - * @param writeOrder Write order. * @param putAll If {@code true} executes putAll. * @param nearCfg Near cache configuration. * @throws Exception If failed. */ - private void atomicPut(CacheAtomicWriteOrderMode writeOrder, - final boolean putAll, + private void atomicPut(final boolean putAll, @Nullable NearCacheConfiguration nearCfg) throws Exception { ccfg = new CacheConfiguration(); @@ -182,7 +179,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac ccfg.setBackups(1); ccfg.setAtomicityMode(ATOMIC); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(writeOrder); ccfg.setRebalanceMode(SYNC); IgniteEx ignite0 = startGrid(0); @@ -213,8 +209,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac final IgniteCache<Integer, Integer> cache = ignite2.cache(null); - assertEquals(writeOrder, cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode()); - IgniteInternalFuture<?> putFut = GridTestUtils.runAsync(new Callable<Object>() { @Override public Object call() throws Exception { Thread.currentThread().setName("put-thread"); @@ -294,21 +288,19 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testAtomicNoRemapPrimaryMode() throws Exception { - atomicNoRemap(PRIMARY); + atomicNoRemap(); } /** - * @param writeOrder Write order. * @throws Exception If failed. */ - private void atomicNoRemap(CacheAtomicWriteOrderMode writeOrder) throws Exception { + private void atomicNoRemap() throws Exception { ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED); ccfg.setBackups(1); ccfg.setAtomicityMode(ATOMIC); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(writeOrder); ccfg.setRebalanceMode(SYNC); IgniteEx ignite0 = startGrid(0); @@ -340,8 +332,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac final IgniteCache<Integer, Integer> cache = ignite3.cache(null); - assertEquals(writeOrder, cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode()); - IgniteInternalFuture<?> putFut = GridTestUtils.runAsync(new Callable<Object>() { @Override public Object call() throws Exception { Thread.currentThread().setName("put-thread"); @@ -388,21 +378,19 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testAtomicGetAndPutPrimaryMode() throws Exception { - atomicGetAndPut(PRIMARY); + atomicGetAndPut(); } /** - * @param writeOrder Write order. * @throws Exception If failed. */ - private void atomicGetAndPut(CacheAtomicWriteOrderMode writeOrder) throws Exception { + private void atomicGetAndPut() throws Exception { ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED); ccfg.setBackups(1); ccfg.setAtomicityMode(ATOMIC); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(writeOrder); ccfg.setRebalanceMode(SYNC); IgniteEx ignite0 = startGrid(0); @@ -428,8 +416,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac final IgniteCache<Integer, Integer> cache = ignite2.cache(null); - assertEquals(writeOrder, cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode()); - IgniteInternalFuture<Integer> putFut = GridTestUtils.runAsync(new Callable<Integer>() { @Override public Integer call() throws Exception { Thread.currentThread().setName("put-thread"); @@ -1659,50 +1645,49 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac public void testAtomicPrimaryPutAllMultinode() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-1685";); - multinode(PRIMARY, TestType.PUT_ALL); + multinode(ATOMIC, TestType.PUT_ALL); } /** * @throws Exception If failed. */ public void testOptimisticTxPutAllMultinode() throws Exception { - multinode(null, TestType.OPTIMISTIC_TX); + multinode(TRANSACTIONAL, TestType.OPTIMISTIC_TX); } /** * @throws Exception If failed. */ public void testOptimisticSerializableTxPutAllMultinode() throws Exception { - multinode(null, TestType.OPTIMISTIC_SERIALIZABLE_TX); + multinode(TRANSACTIONAL, TestType.OPTIMISTIC_SERIALIZABLE_TX); } /** * @throws Exception If failed. */ public void testPessimisticTxPutAllMultinode() throws Exception { - multinode(null, TestType.PESSIMISTIC_TX); + multinode(TRANSACTIONAL, TestType.PESSIMISTIC_TX); } /** * @throws Exception If failed. */ public void testLockAllMultinode() throws Exception { - multinode(null, TestType.LOCK); + multinode(TRANSACTIONAL, TestType.LOCK); } /** - * @param atomicWriteOrder Write order if test atomic cache. + * @param atomicityMode Atomicity mode cache. * @param testType Test type. * @throws Exception If failed. */ - private void multinode(final CacheAtomicWriteOrderMode atomicWriteOrder, final TestType testType) + private void multinode(CacheAtomicityMode atomicityMode, final TestType testType) throws Exception { ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED); ccfg.setBackups(1); - ccfg.setAtomicityMode(atomicWriteOrder != null ? ATOMIC : TRANSACTIONAL); - ccfg.setAtomicWriteOrderMode(atomicWriteOrder); + ccfg.setAtomicityMode(atomicityMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setRebalanceMode(SYNC); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java index 1bfd727..5173237 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java @@ -39,7 +39,6 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; 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.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -67,7 +66,6 @@ public abstract class IgniteCacheMessageRecoveryAbstractTest extends GridCommonA ccfg.setCacheMode(PARTITIONED); ccfg.setAtomicityMode(atomicityMode()); ccfg.setBackups(1); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setNearConfiguration(null); ccfg.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/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java index 6f98c09..507d755 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.distributed.GridCacheAbstractPartitionedByteArrayValuesSelfTest; import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.junit.Assert.assertArrayEquals; @@ -59,19 +58,16 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex atomicCacheCfg.setName(CACHE_ATOMIC); atomicCacheCfg.setAtomicityMode(ATOMIC); - atomicCacheCfg.setAtomicWriteOrderMode(PRIMARY); CacheConfiguration atomicOffheapCacheCfg = offheapCacheConfiguration0(); atomicOffheapCacheCfg.setName(CACHE_ATOMIC_OFFHEAP); atomicOffheapCacheCfg.setAtomicityMode(ATOMIC); - atomicOffheapCacheCfg.setAtomicWriteOrderMode(PRIMARY); CacheConfiguration atomicOffheapTieredCacheCfg = offheapTieredCacheConfiguration(); atomicOffheapTieredCacheCfg.setName(CACHE_ATOMIC_OFFHEAP_TIERED); atomicOffheapTieredCacheCfg.setAtomicityMode(ATOMIC); - atomicOffheapTieredCacheCfg.setAtomicWriteOrderMode(PRIMARY); c.setCacheConfiguration(cacheConfiguration(), offheapCacheConfiguration(), http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java index 67f697f..ce423f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java @@ -23,27 +23,18 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import javax.cache.CacheException; -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 org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedFullApiSelfTest; import org.apache.ignite.testframework.GridTestUtils; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * Multi node test for disabled near cache. */ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiSelfTest { - /** - * @return Write order mode for atomic cache. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; @@ -68,8 +59,6 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS @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/dht/GridCacheAtomicNearCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java index 6ffb443..79188c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java @@ -29,7 +29,6 @@ import javax.cache.processor.EntryProcessor; import javax.cache.processor.MutableEntry; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.configuration.CacheConfiguration; @@ -71,9 +70,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { private int backups; /** */ - private CacheAtomicWriteOrderMode writeOrderMode; - - /** */ private int lastKey; /** {@inheritDoc} */ @@ -87,10 +83,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { ccfg.setNearConfiguration(new NearCacheConfiguration()); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setRebalanceMode(SYNC); - - assert writeOrderMode != null; - - ccfg.setAtomicWriteOrderMode(writeOrderMode); ccfg.setBackups(backups); cfg.setCacheConfiguration(ccfg); @@ -107,7 +99,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testNoBackupsPrimaryWriteOrder() throws Exception { - startGrids(0, CacheAtomicWriteOrderMode.PRIMARY); + startGridsLocal(0); checkNearCache(); } @@ -116,7 +108,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testWithBackupsPrimaryWriteOrder() throws Exception { - startGrids(2, CacheAtomicWriteOrderMode.PRIMARY); + startGridsLocal(2); checkNearCache(); } @@ -776,14 +768,11 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { /** * @param backups Backups number. - * @param writeOrderMode Write order mode. * @throws Exception If failed. */ - private void startGrids(int backups, CacheAtomicWriteOrderMode writeOrderMode) throws Exception { + private void startGridsLocal(int backups) throws Exception { this.backups = backups; - this.writeOrderMode = writeOrderMode; - startGrids(GRID_CNT); awaitPartitionMapExchange(); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java index 0895c42..c192046 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java @@ -17,16 +17,8 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * Test for atomic cache with primary write order mode. */ public class GridCacheAtomicPrimaryWriteOrderFullApiSelfTest extends GridCacheAtomicFullApiSelfTest { - /** {@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/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java index 1f216a7..72c5e17 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java @@ -17,16 +17,8 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * Tests reloadAll for colocated cache with primary write order. */ public class GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest extends GridCacheAtomicReloadAllSelfTest { - /** {@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/dht/GridCacheDhtAtomicRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java index 8a857a5..b4e6a08 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java @@ -17,13 +17,11 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; -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.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -42,11 +40,6 @@ public class GridCacheDhtAtomicRemoveFailureTest extends GridCacheAbstractRemove } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearCache() { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java index 66373fe..ea4112c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java @@ -35,7 +35,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.CacheMemoryMode.OFFHEAP_TIERED; @@ -194,7 +193,6 @@ public class IgniteCacheConcurrentPutGetRemove extends GridCommonAbstractTest { ccfg.setMemoryMode(memoryMode); ccfg.setBackups(backups); 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/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java index 6654fd9..ccc93d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.locks.ReentrantLock; import javax.cache.processor.EntryProcessor; import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.affinity.Affinity; @@ -34,7 +33,6 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest; -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; @@ -60,11 +58,6 @@ public class IgniteCachePartitionedBackupNodeFailureRecoveryTest extends IgniteC } /** {@inheritDoc}*/ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc}*/ @Override protected NearCacheConfiguration nearConfiguration() { 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/dht/IgniteCachePutRetryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java index 57122bd..a69c915 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java @@ -33,7 +33,6 @@ import javax.cache.processor.EntryProcessorResult; import javax.cache.processor.MutableEntry; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.CachePartialUpdateException; @@ -57,7 +56,6 @@ import org.apache.ignite.spi.swapspace.inmemory.GridTestSwapSpaceSpi; 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.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -97,7 +95,6 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst cfg.setAtomicityMode(atomicityMode()); cfg.setWriteSynchronizationMode(FULL_SYNC); - cfg.setAtomicWriteOrderMode(writeOrderMode()); cfg.setBackups(1); cfg.setRebalanceMode(SYNC); @@ -161,13 +158,6 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst protected abstract CacheAtomicityMode atomicityMode(); /** - * @return Write order mode. - */ - protected CacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } - - /** * @throws Exception If failed. */ public void testPut() throws Exception { @@ -274,11 +264,6 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst int iter = 0; try { - if (atomicityMode() == ATOMIC) { - assertEquals(writeOrderMode(), - cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode()); - } - long stopTime = System.currentTimeMillis() + DURATION; switch (test) { http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java index 69f74b9..f2b87e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractFailoverSelfTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -35,8 +34,6 @@ public class GridCacheAtomicFailoverSelfTest extends GridCacheAbstractFailoverSe @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(PRIMARY); - assertEquals(CacheWriteSynchronizationMode.FULL_SYNC, ccfg.getWriteSynchronizationMode()); 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/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index ac7c3e8..5de2524 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.IgniteException; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CachePartialUpdateException; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.affinity.Affinity; @@ -59,7 +58,6 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ThreadLocalRandom8; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; @@ -78,9 +76,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA /** Delay flag. */ private static volatile boolean delay; - /** Write order. */ - private CacheAtomicWriteOrderMode writeOrder; - /** Write sync. */ private CacheWriteSynchronizationMode writeSync; @@ -118,7 +113,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA ccfg.setCacheMode(PARTITIONED); ccfg.setBackups(1); - ccfg.setAtomicWriteOrderMode(writeOrder); ccfg.setWriteSynchronizationMode(writeSync); ccfg.setRebalanceMode(SYNC); @@ -149,55 +143,52 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA * @throws Exception If failed. */ public void testPrimaryFullSync() throws Exception { - checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.HEAP); + checkRestarts(FULL_SYNC, TestMemoryMode.HEAP); } /** * @throws Exception If failed. */ public void testPrimaryFullSyncSwap() throws Exception { - checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.SWAP); + checkRestarts(FULL_SYNC, TestMemoryMode.SWAP); } /** * @throws Exception If failed. */ public void testPrimaryFullSyncOffheapTiered() throws Exception { - checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED); + checkRestarts(FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED); } /** * @throws Exception If failed. */ public void testPrimaryFullSyncOffheapSwap() throws Exception { - checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP); + checkRestarts(FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP); } /** * @throws Exception If failed. */ public void testPrimaryPrimarySync() throws Exception { - checkRestarts(PRIMARY, PRIMARY_SYNC, TestMemoryMode.HEAP); + checkRestarts(PRIMARY_SYNC, TestMemoryMode.HEAP); } /** * @throws Exception If failed. */ public void testPrimaryFullAsync() throws Exception { - checkRestarts(PRIMARY, FULL_ASYNC, TestMemoryMode.HEAP); + checkRestarts(FULL_ASYNC, TestMemoryMode.HEAP); } /** - * @param writeOrder Write order to check. * @param writeSync Write synchronization mode to check. * @param memMode Memory mode. * @throws Exception If failed. */ - private void checkRestarts(CacheAtomicWriteOrderMode writeOrder, - CacheWriteSynchronizationMode writeSync, + private void checkRestarts(CacheWriteSynchronizationMode writeSync, TestMemoryMode memMode) throws Exception { - this.writeOrder = writeOrder; this.writeSync = writeSync; this.memMode = memMode; http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java index 5cc18af..dec8ad2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java @@ -19,8 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; import org.apache.ignite.configuration.CacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * */ @@ -29,8 +27,6 @@ public class GridCacheAtomicPrimaryWriteOrderFailoverSelfTest extends GridCacheA @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(PRIMARY); - 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/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java index 2fd8a82..0eb13a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java @@ -17,13 +17,11 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; -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.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -42,11 +40,6 @@ public class GridCacheAtomicPrimaryWriteOrderRemoveFailureTest extends GridCache } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearCache() { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java index 9d6bc33..8b992ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java @@ -17,13 +17,11 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; -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.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -42,11 +40,6 @@ public class GridCacheAtomicRemoveFailureTest extends GridCacheAbstractRemoveFai } /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearCache() { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java index ac56011..d0a044d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java @@ -17,11 +17,8 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * Tests cache value consistency for ATOMIC mode with near cache enabled. */ @@ -31,9 +28,4 @@ public class GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest @Override protected NearCacheConfiguration nearConfiguration() { return new NearCacheConfiguration(); } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - 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/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java index f270949..878d580 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java @@ -17,16 +17,8 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; - -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * */ public class GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest extends GridCacheValueConsistencyAtomicSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - 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/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java index 3ed1323..f703355 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java @@ -16,17 +16,10 @@ */ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; - /** * */ public class IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest extends IgniteCachePutRetryAtomicSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - 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/GridCacheAtomicMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java index 247d78e..8847b1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.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; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -30,13 +28,6 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; * Multi-node tests for partitioned cache. */ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitionedMultiNodeFullApiSelfTest { - /** - * @return Write order mode for atomic cache. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } - /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; @@ -53,7 +44,6 @@ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitione cc.setRebalanceMode(SYNC); cc.setBackups(1); - cc.setAtomicWriteOrderMode(atomicWriteOrderMode()); return cc; }
