Fix tests CLOCK change to PRIMARY and delete same test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/25d4ea50 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/25d4ea50 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/25d4ea50 Branch: refs/heads/ignite-4587 Commit: 25d4ea5003773b739baba2c2d5c3e7be2194ba7a Parents: a37ff76 Author: Max Kozlov <[email protected]> Authored: Mon Feb 13 12:43:59 2017 +0300 Committer: Max Kozlov <[email protected]> Committed: Mon Feb 13 12:43:59 2017 +0300 ---------------------------------------------------------------------- .../IgniteClientReconnectCacheTest.java | 3 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 3 +- .../GridCacheAtomicMessageCountSelfTest.java | 49 ++++---------------- ...acheInterceptorAtomicReplicatedSelfTest.java | 4 +- .../GridCacheInterceptorAtomicSelfTest.java | 4 +- ...GridCacheInterceptorLocalAtomicSelfTest.java | 4 +- ...idCacheValueConsistencyAbstractSelfTest.java | 4 +- .../cache/GridCacheVersionMultinodeTest.java | 25 ---------- .../cache/IgniteCacheAtomicInvokeTest.java | 4 +- .../cache/IgniteCacheAtomicStoreValueTest.java | 4 +- .../IgniteCacheAtomicExecutionContextTest.java | 4 +- ...iteCachePartitionedExecutionContextTest.java | 4 +- ...niteCacheReplicatedExecutionContextTest.java | 4 +- .../IgniteCacheTxExecutionContextTest.java | 4 +- ...chePartitionedReloadAllAbstractSelfTest.java | 4 +- ...niteCacheClientNodeChangingTopologyTest.java | 45 ------------------ .../dht/GridCacheAtomicFullApiSelfTest.java | 4 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 20 -------- .../GridCacheDhtAtomicRemoveFailureTest.java | 4 +- .../IgniteCachePutRetryAbstractSelfTest.java | 4 +- .../atomic/GridCacheAtomicFailoverSelfTest.java | 4 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 43 ----------------- .../GridCacheAtomicRemoveFailureTest.java | 4 +- ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 4 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 4 +- .../GridCacheAtomicNearRemoveFailureTest.java | 4 +- .../GridCacheAtomicOffHeapFullApiSelfTest.java | 4 +- ...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 4 +- .../near/NearCacheSyncUpdateTest.java | 10 +--- ...eplicatedAtomicMultiNodeFullApiSelfTest.java | 4 +- .../IgniteCacheAtomicExpiryPolicyTest.java | 4 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 14 +++--- ...teCacheClientWriteBehindStoreAtomicTest.java | 4 +- .../DataStreamerUpdateAfterLoadTest.java | 2 - 34 files changed, 66 insertions(+), 244 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java index 0f0165b..d129f4d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java @@ -74,7 +74,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -791,7 +790,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac for (CacheAtomicityMode atomicityMode : CacheAtomicityMode.values()) { CacheAtomicWriteOrderMode[] writeOrders = - atomicityMode == ATOMIC ? values() : new CacheAtomicWriteOrderMode[]{CLOCK}; + atomicityMode == ATOMIC ? values() : new CacheAtomicWriteOrderMode[]{PRIMARY}; for (CacheAtomicWriteOrderMode writeOrder : writeOrders) { for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index be8de79..f49d3ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -105,7 +105,6 @@ import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; 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; @@ -324,7 +323,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract // Concurrent invoke can not be used for ATOMIC cache in CLOCK mode. if (atomicityMode() == ATOMIC && cacheMode() != LOCAL && - cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode() == CLOCK) + false) return; final Set<String> keys = Collections.singleton("myKey"); http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java index e8c5db1..d70d93d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java @@ -40,7 +40,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.CLOCK; 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; @@ -94,13 +93,6 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ - public void testPartitionedClock() throws Exception { - checkMessages(false, CLOCK); - } - - /** - * @throws Exception If failed. - */ public void testPartitionedPrimary() throws Exception { checkMessages(false, PRIMARY); } @@ -108,13 +100,6 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ - public void testClientClock() throws Exception { - checkMessages(true, CLOCK); - } - - /** - * @throws Exception If failed. - */ public void testClientPrimary() throws Exception { checkMessages(true, PRIMARY); } @@ -155,18 +140,10 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest Affinity<Object> affinity = ignite(0).affinity(null); - if (writeOrderMode == CLOCK) { - if (affinity.isPrimary(locNode, i) || affinity.isBackup(locNode, i)) - expNearCnt++; - else - expNearCnt += 2; - } - else { - if (affinity.isPrimary(locNode, i)) - expDhtCnt++; - else - expNearSingleCnt++; - } + if (affinity.isPrimary(locNode, i)) + expDhtCnt++; + else + expNearSingleCnt++; jcache(0).put(i, i); } @@ -175,23 +152,13 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest assertEquals(expNearSingleCnt, commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class)); assertEquals(expDhtCnt, commSpi.messageCount(GridDhtAtomicSingleUpdateRequest.class)); - if (writeOrderMode == CLOCK) { - for (int i = 1; i < 4; i++) { - commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi(); + for (int i = 1; i < 4; i++) { + commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi(); - assertEquals(0, commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class)); - assertEquals(0, commSpi.messageCount(GridNearAtomicFullUpdateRequest.class)); - assertEquals(0, commSpi.messageCount(GridDhtAtomicSingleUpdateRequest.class)); - } + assertEquals(0, commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class)); + assertEquals(0, commSpi.messageCount(GridNearAtomicFullUpdateRequest.class)); } - else { - for (int i = 1; i < 4; i++) { - commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi(); - assertEquals(0, commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class)); - assertEquals(0, commSpi.messageCount(GridNearAtomicFullUpdateRequest.class)); - } - } } finally { stopAllGrids(); http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java index 69af38f..59ee339 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -42,6 +42,6 @@ public class GridCacheInterceptorAtomicReplicatedSelfTest extends GridCacheInter /** {@inheritDoc} */ @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - return CLOCK; + return PRIMARY; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java index 270d2da..80f30fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.cache.CacheInterceptor; import org.apache.ignite.configuration.NearCacheConfiguration; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -42,6 +42,6 @@ public class GridCacheInterceptorAtomicSelfTest extends GridCacheInterceptorAbst /** {@inheritDoc} */ @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - return CLOCK; + return PRIMARY; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java index 4580251..a9a0f0e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; +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 +37,7 @@ public class GridCacheInterceptorLocalAtomicSelfTest extends GridCacheIntercepto /** {@inheritDoc} */ @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java index a4d74d9..6129505 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java @@ -33,7 +33,7 @@ import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.util.typedef.F; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; +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_SYNC; @@ -101,7 +101,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach * @return Atomic write order mode. */ protected CacheAtomicWriteOrderMode writeOrderMode() { - return CLOCK; + return PRIMARY; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java index 199167d..6ff540f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java @@ -32,7 +32,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.CLOCK; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -121,30 +120,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest { /** * @throws Exception If failed. */ - public void testVersionAtomicClock() throws Exception { - atomicityMode = ATOMIC; - - atomicWriteOrder = CLOCK; - - checkVersion(); - } - - /** - * @throws Exception If failed. - */ - public void testVersionAtomicClockNearEnabled() throws Exception { - atomicityMode = ATOMIC; - - atomicWriteOrder = CLOCK; - - near = true; - - checkVersion(); - } - - /** - * @throws Exception If failed. - */ public void testVersionAtomicPrimary() throws Exception { atomicityMode = ATOMIC; http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java index 186d1e7..379952b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -47,7 +47,7 @@ public class IgniteCacheAtomicInvokeTest extends IgniteCacheInvokeAbstractTest { /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 34acb9b..66bdf95 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -47,7 +47,7 @@ public class IgniteCacheAtomicStoreValueTest extends IgniteCacheStoreValueAbstra /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 ef91468..86f5cff 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -41,7 +41,7 @@ public class IgniteCacheAtomicExecutionContextTest extends IgniteCacheAbstractEx /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 e4d5989..4d8457e 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -41,7 +41,7 @@ public class IgniteCachePartitionedExecutionContextTest extends IgniteCacheAbstr /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 9a644b7..3c5f016 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -41,7 +41,7 @@ public class IgniteCacheReplicatedExecutionContextTest extends IgniteCacheAbstra /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 1cde3f8..b75fda3 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; /** @@ -41,7 +41,7 @@ public class IgniteCacheTxExecutionContextTest extends IgniteCacheAbstractExecut /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 1c5c35d..13b5b3b 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 @@ -42,7 +42,7 @@ 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.CLOCK; +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; @@ -125,7 +125,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid * @return Write order mode for atomic cache. */ protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 b4ef11a..4ae63b4 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 @@ -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.CLOCK; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -150,13 +149,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ - public void testAtomicPutAllClockMode() throws Exception { - atomicPut(CLOCK, true, null); - } - - /** - * @throws Exception If failed. - */ public void testAtomicPutAllPrimaryMode() throws Exception { atomicPut(PRIMARY, true, null); } @@ -164,13 +156,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ - public void testAtomicPutAllNearEnabledClockMode() throws Exception { - atomicPut(CLOCK, true, new NearCacheConfiguration()); - } - - /** - * @throws Exception If failed. - */ public void testAtomicPutAllNearEnabledPrimaryMode() throws Exception { atomicPut(PRIMARY, true, new NearCacheConfiguration()); } @@ -178,13 +163,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ - public void testAtomicPutClockMode() throws Exception { - atomicPut(CLOCK, false, null); - } - - /** - * @throws Exception If failed. - */ public void testAtomicPutPrimaryMode() throws Exception { atomicPut(PRIMARY, false, null); } @@ -315,13 +293,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ - public void testAtomicNoRemapClockMode() throws Exception { - atomicNoRemap(CLOCK); - } - - /** - * @throws Exception If failed. - */ public void testAtomicNoRemapPrimaryMode() throws Exception { atomicNoRemap(PRIMARY); } @@ -416,13 +387,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ - public void testAtomicGetAndPutClockMode() throws Exception { - atomicGetAndPut(CLOCK); - } - - /** - * @throws Exception If failed. - */ public void testAtomicGetAndPutPrimaryMode() throws Exception { atomicGetAndPut(PRIMARY); } @@ -1701,15 +1665,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ - public void testAtomicClockPutAllMultinode() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1685";); - - multinode(CLOCK, TestType.PUT_ALL); - } - - /** - * @throws Exception If failed. - */ public void testOptimisticTxPutAllMultinode() throws Exception { multinode(null, TestType.OPTIMISTIC_TX); } http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 84e5860..67f697f 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 @@ -30,7 +30,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -41,7 +41,7 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS * @return Write order mode for atomic cache. */ protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 c4fd7b3..6ffb443 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 @@ -45,7 +45,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -116,31 +115,12 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testNoBackupsClockWriteOrder() throws Exception { - startGrids(0, CLOCK); - - checkNearCache(); - } - - /** - * @throws Exception If failed. - */ public void testWithBackupsPrimaryWriteOrder() throws Exception { startGrids(2, CacheAtomicWriteOrderMode.PRIMARY); checkNearCache(); } - - /** - * @throws Exception If failed. - */ - public void testWithBackupsClockWriteOrder() throws Exception { - startGrids(2, CLOCK); - - checkNearCache(); - } - /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 bee94a2..8a857a5 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 @@ -23,7 +23,7 @@ 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.CLOCK; +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,7 +43,7 @@ public class GridCacheDhtAtomicRemoveFailureTest extends GridCacheAbstractRemove /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 c3d194b..57122bd 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 @@ -57,7 +57,7 @@ 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.CLOCK; +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; @@ -164,7 +164,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst * @return Write order mode. */ protected CacheAtomicWriteOrderMode writeOrderMode() { - return CLOCK; + return PRIMARY; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 f7286b3..69f74b9 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,7 @@ 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.CLOCK; +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,7 +35,7 @@ public class GridCacheAtomicFailoverSelfTest extends GridCacheAbstractFailoverSe @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(CLOCK); + ccfg.setAtomicWriteOrderMode(PRIMARY); assertEquals(CacheWriteSynchronizationMode.FULL_SYNC, ccfg.getWriteSynchronizationMode()); http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 644e310..1b7b75a 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 @@ -59,7 +59,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.CLOCK; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -149,48 +148,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA /** * @throws Exception If failed. */ - public void testClockFullSync() throws Exception { - checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.HEAP); - } - - /** - * @throws Exception If failed. - */ - public void testClockFullSyncSwap() throws Exception { - checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.SWAP); - } - - /** - * @throws Exception If failed. - */ - public void testClockFullSyncOffheapTiered() throws Exception { - checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED); - } - - /** - * @throws Exception If failed. - */ - public void testClockFullSyncOffheapSwap() throws Exception { - checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP); - } - - /** - * @throws Exception If failed. - */ - public void testClockPrimarySync() throws Exception { - checkRestarts(CLOCK, PRIMARY_SYNC, TestMemoryMode.HEAP); - } - - /** - * @throws Exception If failed. - */ - public void testClockFullAsync() throws Exception { - checkRestarts(CLOCK, FULL_ASYNC, TestMemoryMode.HEAP); - } - - /** - * @throws Exception If failed. - */ public void testPrimaryFullSync() throws Exception { checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.HEAP); } http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 a21cd35..9d6bc33 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 @@ -23,7 +23,7 @@ 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.CLOCK; +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,7 +43,7 @@ public class GridCacheAtomicRemoveFailureTest extends GridCacheAbstractRemoveFai /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 9948fcb..247d78e 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -34,7 +34,7 @@ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitione * @return Write order mode for atomic cache. */ protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 d4efff3..a8cd7e3 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -34,7 +34,7 @@ public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest * @return Write order mode for atomic cache. */ protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 d9c6e01..3548edb 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 @@ -23,7 +23,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** @@ -42,7 +42,7 @@ public class GridCacheAtomicNearRemoveFailureTest extends GridCacheAbstractRemov /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 4551981..55374d1 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -33,7 +33,7 @@ public class GridCacheAtomicOffHeapFullApiSelfTest extends GridCachePartitionedO * @return Write order mode for atomic cache. */ protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 f353483..d854fce 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -34,7 +34,7 @@ public class GridCacheAtomicOffHeapMultiNodeFullApiSelfTest extends * @return Write order mode for atomic cache. */ protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 bbdf50e..5f68e92 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 @@ -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.CLOCK; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -66,14 +65,7 @@ public class NearCacheSyncUpdateTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testNearCacheSyncUpdateAtomic1() throws Exception { - nearCacheSyncUpdateTx(ATOMIC, CLOCK); - } - - /** - * @throws Exception If failed. - */ - public void testNearCacheSyncUpdateAtomic2() throws Exception { + public void testNearCacheSyncUpdateAtomic() throws Exception { nearCacheSyncUpdateTx(ATOMIC, PRIMARY); } http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 51a087a..92670d7 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 @@ -21,7 +21,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -32,7 +32,7 @@ public class GridCacheReplicatedAtomicMultiNodeFullApiSelfTest extends GridCache * @return Write order mode for atomic cache. */ protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 c2ee607..ba2a1db 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 @@ -22,7 +22,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -47,7 +47,7 @@ public class IgniteCacheAtomicExpiryPolicyTest extends IgniteCacheExpiryPolicyAb /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 f22ca6d..62e4e73 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,7 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; +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 +878,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs IgniteCache<Integer, Integer> cache1 = jcache(1); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK) + if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) Thread.sleep(100); // Update from another node. @@ -886,7 +886,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs checkTtl(key, 61_000L); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK) + if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) Thread.sleep(100); // Update from another node with provided TTL. @@ -901,7 +901,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs checkTtl(key, 60_000L); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK) + if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) Thread.sleep(100); // Update from near node with provided TTL. @@ -930,7 +930,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs for (Integer key : vals.keySet()) checkTtl(key, 60_000L); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK) + if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) Thread.sleep(100); IgniteCache<Integer, Integer> cache1 = jcache(1); @@ -941,7 +941,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs for (Integer key : vals.keySet()) checkTtl(key, 61_000L); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK) + if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) Thread.sleep(100); // Update from another node with provided TTL. @@ -955,7 +955,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs // Try create again. cache0.putAll(vals); - if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK) + if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY) Thread.sleep(100); // Update from near node with provided TTL. http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 4eb2f2b..55047e9 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 @@ -20,7 +20,7 @@ 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.CLOCK; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -34,6 +34,6 @@ public class IgnteCacheClientWriteBehindStoreAtomicTest extends IgnteCacheClient /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return CLOCK; + return PRIMARY; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 32e204b..45eba6c 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 @@ -31,7 +31,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.CLOCK; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -153,7 +152,6 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest { ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, PRIMARY, 1, "cache-" + ccfgs.size())); ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, PRIMARY, 0, "cache-" + ccfgs.size())); - ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, CLOCK, 1, "cache-" + ccfgs.size())); ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, null, 1, "cache-" + ccfgs.size())); ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, null, 0, "cache-" + ccfgs.size()));
