Remove CacheAtomicWriteOrderMode.java and refactoring core module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72c15e59 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72c15e59 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72c15e59 Branch: refs/heads/ignite-4587 Commit: 72c15e5974fa253b919d001677e98a87ed219991 Parents: 8a96fdf Author: Max Kozlov <[email protected]> Authored: Wed Mar 1 16:01:35 2017 +0300 Committer: Max Kozlov <[email protected]> Committed: Wed Mar 1 16:01:35 2017 +0300 ---------------------------------------------------------------------- .../ignite/cache/CacheAtomicWriteOrderMode.java | 48 ----------- .../configuration/CacheConfiguration.java | 28 ------- .../processors/cache/GridCacheMapEntry.java | 5 +- .../processors/cache/GridCacheProcessor.java | 11 --- .../datastructures/DataStructuresProcessor.java | 2 - .../utils/PlatformConfigurationUtils.java | 3 - .../visor/cache/VisorCacheConfiguration.java | 12 --- .../ignite/startup/BasicWarmupClosure.java | 1 - .../resources/META-INF/classnames.properties | 1 - .../IgniteClientReconnectCacheTest.java | 86 +++++++++----------- .../CacheAtomicSingleMessageCountSelfTest.java | 2 - .../cache/CacheEnumOperationsAbstractTest.java | 2 - ...torPartitionCounterRandomOperationsTest.java | 2 - .../CacheStoreUsageMultinodeAbstractTest.java | 2 - .../EntryVersionConsistencyReadThroughTest.java | 2 - .../GridCacheAbstractLocalStoreSelfTest.java | 16 +--- .../GridCacheAbstractRemoveFailureTest.java | 9 -- .../GridCacheAtomicMessageCountSelfTest.java | 15 +--- .../cache/GridCacheEntryVersionSelfTest.java | 2 - .../cache/GridCacheIncrementTransformTest.java | 2 - .../GridCacheInterceptorAbstractSelfTest.java | 19 +---- ...erceptorAtomicPrimaryWriteOrderSelfTest.java | 8 -- ...omicReplicatedPrimaryWriteOrderSelfTest.java | 8 -- ...acheInterceptorAtomicReplicatedSelfTest.java | 8 -- .../GridCacheInterceptorAtomicSelfTest.java | 8 -- ...GridCacheInterceptorLocalAtomicSelfTest.java | 8 -- ...HeapMultiThreadedUpdateAbstractSelfTest.java | 2 - .../GridCacheOffHeapTieredAbstractSelfTest.java | 3 - ...heOffHeapTieredEvictionAbstractSelfTest.java | 3 - .../GridCacheReturnValueTransferSelfTest.java | 15 +--- ...ridCacheStoreManagerDeserializationTest.java | 10 --- ...idCacheValueConsistencyAbstractSelfTest.java | 10 --- .../cache/GridCacheVersionMultinodeTest.java | 15 ---- .../GridCacheVersionTopologyChangeTest.java | 2 - .../cache/IgniteCacheAbstractTest.java | 14 ---- .../cache/IgniteCacheAtomicInvokeTest.java | 7 -- .../cache/IgniteCacheAtomicPeekModesTest.java | 7 -- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 7 -- ...heAtomicPrimaryWriteOrderStoreValueTest.java | 8 -- .../cache/IgniteCacheAtomicStoreValueTest.java | 7 -- .../IgniteCacheEntryListenerAtomicTest.java | 7 -- ...niteCacheEntryListenerExpiredEventsTest.java | 2 - .../IgniteCacheEntryProcessorCallTest.java | 3 - ...gniteCacheInvokeReadThroughAbstractTest.java | 2 - .../IgniteCacheP2pUnmarshallingErrorTest.java | 6 -- .../IgniteCacheReadThroughStoreCallTest.java | 2 - .../cache/IgniteCacheTxPeekModesTest.java | 7 -- .../cache/IgniteExchangeFutureHistoryTest.java | 6 -- ...logyValidatorPartitionedAtomicCacheTest.java | 7 -- ...ologyValidatorReplicatedAtomicCacheTest.java | 7 -- .../IgniteCacheAtomicExecutionContextTest.java | 7 -- ...iteCachePartitionedExecutionContextTest.java | 7 -- ...niteCacheReplicatedExecutionContextTest.java | 7 -- .../IgniteCacheTxExecutionContextTest.java | 7 -- ...CacheAtomicNearUpdateTopologyChangeTest.java | 7 -- .../CacheLateAffinityAssignmentTest.java | 2 - ...NearDisabledAtomicInvokeRestartSelfTest.java | 6 -- ...dCacheMultithreadedFailoverAbstractTest.java | 15 +--- ...chePartitionedReloadAllAbstractSelfTest.java | 11 --- .../GridCacheTransformEventSelfTest.java | 2 - .../IgniteCacheAtomicNodeJoinTest.java | 6 -- ...niteCacheClientNodeChangingTopologyTest.java | 49 ++++------- .../IgniteCacheMessageRecoveryAbstractTest.java | 2 - ...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 - .../dht/GridCacheAtomicFullApiSelfTest.java | 11 --- .../dht/GridCacheAtomicNearCacheSelfTest.java | 17 +--- ...eAtomicPrimaryWriteOrderFullApiSelfTest.java | 8 -- ...tomicPrimaryWriteOrderReloadAllSelfTest.java | 8 -- .../GridCacheDhtAtomicRemoveFailureTest.java | 7 -- .../dht/IgniteCacheConcurrentPutGetRemove.java | 2 - ...artitionedBackupNodeFailureRecoveryTest.java | 7 -- .../IgniteCachePutRetryAbstractSelfTest.java | 15 ---- .../atomic/GridCacheAtomicFailoverSelfTest.java | 3 - ...eAtomicInvalidPartitionHandlingSelfTest.java | 23 ++---- ...AtomicPrimaryWriteOrderFailoverSelfTest.java | 4 - ...tomicPrimaryWriteOrderRemoveFailureTest.java | 7 -- .../GridCacheAtomicRemoveFailureTest.java | 7 -- ...micPrimaryWriteOrderNearEnabledSelfTest.java | 8 -- ...sistencyAtomicPrimaryWriteOrderSelfTest.java | 8 -- ...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 7 -- ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 10 --- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 11 --- .../GridCacheAtomicNearRemoveFailureTest.java | 7 -- .../GridCacheAtomicOffHeapFullApiSelfTest.java | 11 --- ...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 11 --- ...idCacheAtomicPartitionedMetricsSelfTest.java | 2 - ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 8 -- ...rderMultiNodeP2PDisabledFullApiSelfTest.java | 8 -- ...cPrimaryWriteOrderNearRemoveFailureTest.java | 7 -- ...PrimaryWriteOrderOffHeapFullApiSelfTest.java | 8 -- ...ityOrderOffHeapMultiNodeFullApiSelfTest.java | 8 -- .../near/GridCacheNearEvictionSelfTest.java | 2 - ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 - .../near/NearCacheSyncUpdateTest.java | 17 ++-- .../GridCacheRebalancingOrderingTest.java | 2 - ...cheRebalancingPartitionDistributionTest.java | 2 - ...ridCacheAtomicReplicatedMetricsSelfTest.java | 2 - ...eplicatedAtomicMultiNodeFullApiSelfTest.java | 11 --- ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 8 -- .../IgniteCacheAtomicExpiryPolicyTest.java | 7 -- ...iteCacheAtomicExpiryPolicyWithStoreTest.java | 7 -- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 8 -- .../IgniteCacheExpiryPolicyAbstractTest.java | 13 ++- .../IgniteCacheAtomicLoadAllTest.java | 7 -- .../IgniteCacheAtomicLoaderWriterTest.java | 7 -- ...gniteCacheAtomicNoLoadPreviousValueTest.java | 7 -- .../IgniteCacheAtomicNoReadThroughTest.java | 7 -- .../IgniteCacheAtomicNoWriteThroughTest.java | 7 -- .../IgniteCacheAtomicStoreSessionTest.java | 7 -- ...eCacheAtomicStoreSessionWriteBehindTest.java | 7 -- ...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 8 -- .../GridCacheAtomicLocalMetricsSelfTest.java | 2 - .../GridCacheSwapScanQueryAbstractSelfTest.java | 3 - ...FailoverAtomicPrimaryWriteOrderSelfTest.java | 7 -- ...eContinuousQueryAsyncFilterListenerTest.java | 2 - ...acheContinuousQueryExecuteInPrimaryTest.java | 2 - ...ContinuousQueryFailoverAbstractSelfTest.java | 10 --- ...ryFailoverAtomicNearEnabledSelfSelfTest.java | 7 -- ...FailoverAtomicPrimaryWriteOrderSelfTest.java | 8 -- ...usQueryFailoverAtomicReplicatedSelfTest.java | 7 -- ...ontinuousQueryOperationFromCallbackTest.java | 2 - .../CacheContinuousQueryOperationP2PTest.java | 2 - .../CacheContinuousQueryOrderingEventTest.java | 2 - ...acheContinuousQueryRandomOperationsTest.java | 2 - .../CacheKeepBinaryIterationTest.java | 2 - ...teCacheClientWriteBehindStoreAtomicTest.java | 7 -- .../DataStreamerUpdateAfterLoadTest.java | 13 +-- .../ServicePredicateAccessCacheTest.java | 4 +- .../configvariations/ConfigVariations.java | 3 - .../testframework/junits/GridAbstractTest.java | 2 - .../junits/common/GridCommonAbstractTest.java | 1 - 131 files changed, 95 insertions(+), 965 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java deleted file mode 100644 index 2595d29..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache; - -import org.jetbrains.annotations.Nullable; - -/** - * Cache write ordering mode. This enumeration is taken into account only in {@link CacheAtomicityMode#ATOMIC} - * atomicity mode. Write ordering mode determines which node assigns the write version, sender or the primary node. - * <p> - * For example, {@link #PRIMARY} mode would only send request to primary node, which in turn will assign write version - * and forward it to backups. - */ -public enum CacheAtomicWriteOrderMode { - /** - * Cache version is assigned only on primary node. This means that sender will only send write request - * to primary node, which in turn will assign write version and forward it to backups. - */ - PRIMARY; - - /** Enumerated values. */ - private static final CacheAtomicWriteOrderMode[] VALS = values(); - - /** - * Efficiently gets enumerated value from its ordinal. - * - * @param ord Ordinal value. - * @return Enumerated value or {@code null} if ordinal out of range. - */ - @Nullable public static CacheAtomicWriteOrderMode fromOrdinal(byte ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 0656dda..c65bcc0 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -42,7 +42,6 @@ import javax.cache.configuration.MutableConfiguration; import javax.cache.expiry.ExpiryPolicy; 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.CacheInterceptor; @@ -293,9 +292,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { /** Cache atomicity mode. */ private CacheAtomicityMode atomicityMode; - /** Write ordering mode. */ - private CacheAtomicWriteOrderMode atomicWriteOrderMode; - /** Number of backups for cache. */ private int backups = DFLT_BACKUPS; @@ -442,7 +438,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { aff = cc.getAffinity(); affMapper = cc.getAffinityMapper(); atomicityMode = cc.getAtomicityMode(); - atomicWriteOrderMode = cc.getAtomicWriteOrderMode(); backups = cc.getBackups(); cacheLoaderFactory = cc.getCacheLoaderFactory(); cacheMode = cc.getCacheMode(); @@ -1044,29 +1039,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { } /** - * Gets cache write ordering mode. This property can be enabled only for {@link CacheAtomicityMode#ATOMIC} - * cache (for other atomicity modes it will be ignored). - * - * @return Cache write ordering mode. - */ - public CacheAtomicWriteOrderMode getAtomicWriteOrderMode() { - return atomicWriteOrderMode; - } - - /** - * Sets cache write ordering mode. This property can be enabled only for {@link CacheAtomicityMode#ATOMIC} - * cache (for other atomicity modes it will be ignored). - * - * @param atomicWriteOrderMode Cache write ordering mode. - * @return {@code this} for chaining. - */ - public CacheConfiguration<K, V> setAtomicWriteOrderMode(CacheAtomicWriteOrderMode atomicWriteOrderMode) { - this.atomicWriteOrderMode = atomicWriteOrderMode; - - return this; - } - - /** * Gets number of nodes used to back up single partition for {@link CacheMode#PARTITIONED} cache. * <p> * If not set, default value is {@link #DFLT_BACKUPS}. http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 942ae21..c33b60d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -34,7 +34,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.eviction.EvictableEntry; import org.apache.ignite.internal.binary.BinaryObjectOffheapImpl; @@ -2157,7 +2156,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme assert conflictCtx != null; - boolean ignoreTime = cctx.config().getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.PRIMARY; + boolean ignoreTime = true; // Use old value? if (conflictCtx.isUseOld()) { @@ -2213,7 +2212,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme conflictVer = null; } - boolean ignoreTime = cctx.config().getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.PRIMARY; + boolean ignoreTime = true; // Perform version check only in case there was no explicit conflict resolution. if (conflictCtx == null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index f1aa7f2..0dc85a9 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -43,7 +43,6 @@ import javax.management.JMException; import javax.management.MBeanServer; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheExistsException; import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; @@ -285,16 +284,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { assert cfg.getWriteSynchronizationMode() != null; - if (cfg.getAtomicityMode() == ATOMIC) { - if (cfg.getAtomicWriteOrderMode() == null) { - cfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY); - - U.warn(log, "Automatically set write order mode to PRIMARY for better performance " + - "[writeSynchronizationMode=" + cfg.getWriteSynchronizationMode() + ", " + - "cacheName=" + U.maskName(cfg.getName()) + ']'); - } - } - if (cfg.getCacheStoreFactory() == null) { Factory<CacheLoader> ldrFactory = cfg.getCacheLoaderFactory(); Factory<CacheWriter> writerFactory = cfg.isWriteThrough() ? cfg.getCacheWriterFactory() : null; http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 1cad22f..71ccd6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -84,7 +84,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; @@ -919,7 +918,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { ccfg.setOffHeapMaxMemory(cfg.getOffHeapMaxMemory()); ccfg.setNodeFilter(cfg.getNodeFilter()); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setRebalanceMode(SYNC); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index c0fde97..5b5f733 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@ -23,7 +23,6 @@ import org.apache.ignite.binary.BinaryIdentityResolver; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; import org.apache.ignite.binary.BinaryTypeConfiguration; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; @@ -136,7 +135,6 @@ public class PlatformConfigurationUtils { CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setAtomicityMode(CacheAtomicityMode.fromOrdinal(in.readInt())); - ccfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.fromOrdinal((byte)in.readInt())); ccfg.setBackups(in.readInt()); ccfg.setCacheMode(CacheMode.fromOrdinal(in.readInt())); ccfg.setCopyOnRead(in.readBoolean()); @@ -761,7 +759,6 @@ public class PlatformConfigurationUtils { assert ccfg != null; writeEnumInt(writer, ccfg.getAtomicityMode(), CacheConfiguration.DFLT_CACHE_ATOMICITY_MODE); - writeEnumInt(writer, ccfg.getAtomicWriteOrderMode()); writer.writeInt(ccfg.getBackups()); writeEnumInt(writer, ccfg.getCacheMode(), CacheConfiguration.DFLT_CACHE_MODE); writer.writeBoolean(ccfg.isCopyOnRead()); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java index 869a12c..848ca8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.cache; import java.io.Serializable; import java.util.Collection; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; @@ -53,9 +52,6 @@ public class VisorCacheConfiguration implements Serializable, LessNamingBean { /** Cache atomicity mode. */ private CacheAtomicityMode atomicityMode; - /** Cache atomicity write ordering mode. */ - private CacheAtomicWriteOrderMode atomicWriteOrderMode; - /** Eager ttl flag. */ private boolean eagerTtl; @@ -134,7 +130,6 @@ public class VisorCacheConfiguration implements Serializable, LessNamingBean { name = ccfg.getName(); mode = ccfg.getCacheMode(); atomicityMode = ccfg.getAtomicityMode(); - atomicWriteOrderMode = ccfg.getAtomicWriteOrderMode(); eagerTtl = ccfg.isEagerTtl(); writeSynchronizationMode = ccfg.getWriteSynchronizationMode(); swapEnabled = ccfg.isSwapEnabled(); @@ -198,13 +193,6 @@ public class VisorCacheConfiguration implements Serializable, LessNamingBean { } /** - * @return Cache atomicity write ordering mode. - */ - public CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return atomicWriteOrderMode; - } - - /** * @return Eager ttl flag */ public boolean eagerTtl() { http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java index 270a5c6..659ffbe 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java @@ -414,7 +414,6 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> F.eq(ccfg0.getCacheMode(), ccfg1.getCacheMode()) && F.eq(ccfg0.getBackups(), ccfg1.getBackups()) && F.eq(ccfg0.getAtomicityMode(), ccfg1.getAtomicityMode()) && - F.eq(ccfg0.getAtomicWriteOrderMode(), ccfg1.getAtomicWriteOrderMode()) && F.eq(ccfg0.getMemoryMode(), ccfg1.getMemoryMode()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index 212e94a..6cce80a 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -28,7 +28,6 @@ org.apache.ignite.binary.BinaryInvalidTypeException org.apache.ignite.binary.BinaryObject org.apache.ignite.binary.BinaryObjectException org.apache.ignite.cache.CacheAtomicUpdateTimeoutException -org.apache.ignite.cache.CacheAtomicWriteOrderMode org.apache.ignite.cache.CacheAtomicityMode org.apache.ignite.cache.CacheEntryEventSerializableFilter org.apache.ignite.cache.CacheEntryProcessor http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 d129f4d..67c52de 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 @@ -38,7 +38,6 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteTransactions; import org.apache.ignite.Ignition; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cluster.ClusterGroup; @@ -74,8 +73,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.PRIMARY; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -172,7 +169,6 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setName("nearCache"); - ccfg.setAtomicWriteOrderMode(PRIMARY); final IgniteCache<Object, Object> nearCache = client.getOrCreateCache(ccfg, new NearCacheConfiguration<>()); @@ -211,7 +207,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac catch (CacheException e) { log.info("Expected exception: " + e); - IgniteClientDisconnectedException e0 = (IgniteClientDisconnectedException) e.getCause(); + IgniteClientDisconnectedException e0 = (IgniteClientDisconnectedException)e.getCause(); e0.reconnectFuture().get(); } @@ -225,7 +221,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac })); disconnectLatch.countDown(); - } else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) { + } + else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) { info("Reconnected: " + evt); assertEquals(0, disconnectLatch.getCount()); @@ -340,7 +337,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac tx.commit(); fail(); - } catch (IgniteClientDisconnectedException e) { + } + catch (IgniteClientDisconnectedException e) { log.info("Expected error: " + e); assertNotNull(e.reconnectFuture()); @@ -350,7 +348,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac txs.txStart(); fail(); - } catch (IgniteClientDisconnectedException e) { + } + catch (IgniteClientDisconnectedException e) { log.info("Expected error: " + e); assertNotNull(e.reconnectFuture()); @@ -408,8 +407,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac private void reconnectTransactionInProgress1(IgniteEx client, final TransactionConcurrency txConcurrency, final IgniteCache<Object, Object> cache) - throws Exception - { + throws Exception { Ignite srv = clientRouter(client); final TestTcpDiscoverySpi clientSpi = spi(client); @@ -428,7 +426,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac info("Disconnected: " + evt); disconnectLatch.countDown(); - } else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) { + } + else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) { info("Reconnected: " + evt); reconnectLatch.countDown(); @@ -789,42 +788,34 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac int cnt = 0; for (CacheAtomicityMode atomicityMode : CacheAtomicityMode.values()) { - CacheAtomicWriteOrderMode[] writeOrders = - atomicityMode == ATOMIC ? values() : new CacheAtomicWriteOrderMode[]{PRIMARY}; - - for (CacheAtomicWriteOrderMode writeOrder : writeOrders) { - for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) { - CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(); - - ccfg.setAtomicityMode(atomicityMode); + for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) { + CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(); - ccfg.setAtomicWriteOrderMode(writeOrder); + ccfg.setAtomicityMode(atomicityMode); - ccfg.setName("cache-" + cnt++); + ccfg.setName("cache-" + cnt++); - ccfg.setWriteSynchronizationMode(syncMode); + ccfg.setWriteSynchronizationMode(syncMode); - if (syncMode != FULL_ASYNC) { - Class<?> cls = (ccfg.getAtomicityMode() == ATOMIC) ? - GridNearAtomicUpdateResponse.class : GridNearTxPrepareResponse.class; + if (syncMode != FULL_ASYNC) { + Class<?> cls = (ccfg.getAtomicityMode() == ATOMIC) ? + GridNearAtomicUpdateResponse.class : GridNearTxPrepareResponse.class; - log.info("Test cache put [atomicity=" + atomicityMode + - ", writeOrder=" + writeOrder + - ", syncMode=" + syncMode + ']'); + log.info("Test cache put [atomicity=" + atomicityMode + + ", syncMode=" + syncMode + ']'); - checkOperationInProgressFails(client, ccfg, cls, putOp); + checkOperationInProgressFails(client, ccfg, cls, putOp); - client.destroyCache(ccfg.getName()); - } + client.destroyCache(ccfg.getName()); + } - log.info("Test cache get [atomicity=" + atomicityMode + ", syncMode=" + syncMode + ']'); + log.info("Test cache get [atomicity=" + atomicityMode + ", syncMode=" + syncMode + ']'); - checkOperationInProgressFails(client, ccfg, GridNearSingleGetResponse.class, getOp); + checkOperationInProgressFails(client, ccfg, GridNearSingleGetResponse.class, getOp); - checkOperationInProgressFails(client, ccfg, GridNearGetResponse.class, getAllOp); + checkOperationInProgressFails(client, ccfg, GridNearGetResponse.class, getAllOp); - client.destroyCache(ccfg.getName()); - } + client.destroyCache(ccfg.getName()); } } } @@ -1123,7 +1114,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac @Override public Void call() throws Exception { int idx = nodeIdx.incrementAndGet(); - for (int i = 0; i < 25; i++) { + for (int i = 0; i < 25; i++) { startGrid(idx); stopGrid(idx); @@ -1262,27 +1253,32 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac /** * */ - static class TestClass1 implements Serializable {} + static class TestClass1 implements Serializable { + } /** * */ - static class TestClass2 implements Serializable {} + static class TestClass2 implements Serializable { + } /** * */ - static class TestClass3 implements Serializable {} + static class TestClass3 implements Serializable { + } /** * */ - static class TestClass4 implements Serializable {} + static class TestClass4 implements Serializable { + } /** * */ - static class TestClass5 implements Serializable {} + static class TestClass5 implements Serializable { + } /** * @param client Client. @@ -1295,8 +1291,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac final CacheConfiguration<Object, Object> ccfg, Class<?> msgToBlock, final IgniteInClosure<IgniteCache<Object, Object>> c) - throws Exception - { + throws Exception { Ignite srv = clientRouter(client); TestTcpDiscoverySpi srvSpi = spi(srv); @@ -1383,8 +1378,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac String cacheName, boolean cacheExists, boolean clientCache, - boolean clientNear) - { + boolean clientNear) { GridDiscoveryManager srvDisco = ((IgniteKernal)srv).context().discovery(); GridDiscoveryManager clientDisco = ((IgniteKernal)client).context().discovery(); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java index 8822115..018b695 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java @@ -42,7 +42,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -72,7 +71,6 @@ public class CacheAtomicSingleMessageCountSelfTest extends GridCommonAbstractTes cCfg.setCacheMode(PARTITIONED); cCfg.setBackups(1); cCfg.setWriteSynchronizationMode(FULL_SYNC); - cCfg.setAtomicWriteOrderMode(PRIMARY); cfg.setCacheConfiguration(cCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java index 87a9b91..d37348d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java @@ -35,7 +35,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES; @@ -283,7 +282,6 @@ public abstract class CacheEnumOperationsAbstractTest extends GridCommonAbstract ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (memoryMode == OFFHEAP_TIERED) ccfg.setOffHeapMaxMemory(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java index 055374d..3a05c28 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java @@ -61,7 +61,6 @@ import org.jetbrains.annotations.NotNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; @@ -840,7 +839,6 @@ public class CacheInterceptorPartitionCounterRandomOperationsTest extends GridCo ccfg.setCacheMode(cacheMode); ccfg.setMemoryMode(memoryMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); if (cacheMode == PARTITIONED) ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java index eaae2f9..68e62a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java @@ -26,7 +26,6 @@ import javax.cache.configuration.Factory; import javax.cache.integration.CacheLoaderException; 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.affinity.Affinity; import org.apache.ignite.cache.store.CacheStore; @@ -105,7 +104,6 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs ccfg.setCacheMode(PARTITIONED); ccfg.setAtomicityMode(atomicityMode()); - ccfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY); ccfg.setBackups(1); 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/EntryVersionConsistencyReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java index 4216b5e..a6eae47 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java @@ -40,7 +40,6 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -75,7 +74,6 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe cc.setCacheMode(PARTITIONED); cc.setAtomicityMode(atomicityMode); - cc.setAtomicWriteOrderMode(PRIMARY); cc.setWriteSynchronizationMode(FULL_SYNC); cc.setReadThrough(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java index 26ab625..7dff70d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java @@ -63,7 +63,6 @@ import org.apache.ignite.transactions.Transaction; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOCAL_STORE_KEEPS_PRIMARY_ONLY; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -104,9 +103,6 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst public static final String BACKUP_CACHE_2 = "backup_2"; /** */ - public static volatile boolean primaryWriteOrderMode = false; - - /** */ public static volatile boolean near = false; /** @@ -173,9 +169,6 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst cacheCfg.setNearConfiguration(nearConfiguration()); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - if (primaryWriteOrderMode) - cacheCfg.setAtomicWriteOrderMode(PRIMARY); - cacheCfg.setRebalanceMode(SYNC); if (gridName.endsWith("1")) @@ -312,14 +305,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst * @throws Exception If failed. */ public void testBackupRestorePrimary() throws Exception { - try { - primaryWriteOrderMode = true; - - testBackupRestore(); - } - finally { - primaryWriteOrderMode = false; - } + testBackupRestore(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index cc013bd..8e034d4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -33,7 +33,6 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteTransactions; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; @@ -150,13 +149,6 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr protected abstract NearCacheConfiguration nearCache(); /** - * @return Atomic cache write order mode. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return null; - } - - /** * @return {@code True} if test updates from client node. */ protected boolean testClientNode() { @@ -229,7 +221,6 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr ccfg.setBackups(1); ccfg.setAtomicityMode(atomicityMode()); - ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); ccfg.setNearConfiguration(nearCache()); GridTestUtils.setMemoryMode(null, ccfg, memMode, 100, 1024); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 d70d93d..315cb20 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 @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.IgniteException; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; @@ -40,7 +39,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -57,9 +55,6 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest /** Client mode flag. */ private boolean client; - /** Write sync mode. */ - private CacheAtomicWriteOrderMode writeOrderMode; - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -76,7 +71,6 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest cCfg.setCacheMode(PARTITIONED); cCfg.setBackups(1); cCfg.setWriteSynchronizationMode(FULL_SYNC); - cCfg.setAtomicWriteOrderMode(writeOrderMode); if (idx == 0 && client) cfg.setClientMode(true); @@ -94,26 +88,23 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testPartitionedPrimary() throws Exception { - checkMessages(false, PRIMARY); + checkMessages(false); } /** * @throws Exception If failed. */ public void testClientPrimary() throws Exception { - checkMessages(true, PRIMARY); + checkMessages(true); } /** * @param clientMode Client mode flag. - * @param orderMode Write ordering mode. * @throws Exception If failed. */ - protected void checkMessages(boolean clientMode, - CacheAtomicWriteOrderMode orderMode) throws Exception { + protected void checkMessages(boolean clientMode) throws Exception { client = clientMode; - writeOrderMode = orderMode; startGrids(4); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java index ad37e17..60faf76 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -57,7 +56,6 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest { CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setBackups(1); ccfg.setAtomicityMode(atomicityMode); 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/GridCacheIncrementTransformTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java index a3d2dde..5625038 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java @@ -36,7 +36,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -66,7 +65,6 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest { cache.setCacheMode(PARTITIONED); cache.setAtomicityMode(ATOMIC); - cache.setAtomicWriteOrderMode(PRIMARY); cache.setWriteSynchronizationMode(FULL_SYNC); cache.setBackups(1); cache.setRebalanceMode(SYNC); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index 68bfb6f..0904fab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@ -29,7 +29,6 @@ import javax.cache.Cache; 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.CacheEntry; import org.apache.ignite.cache.CacheInterceptor; import org.apache.ignite.cache.CacheMode; @@ -47,7 +46,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.LOCAL; @@ -116,12 +114,6 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst ccfg.setInterceptor(interceptor); - if (ccfg.getAtomicityMode() == ATOMIC) { - assertNotNull(writeOrderMode()); - - ccfg.setAtomicWriteOrderMode(writeOrderMode()); - } - if (!storeEnabled()) { ccfg.setCacheStoreFactory(null); ccfg.setReadThrough(false); @@ -137,13 +129,6 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst } /** - * @return Atomic cache write order mode. - */ - @Nullable protected CacheAtomicWriteOrderMode writeOrderMode() { - return null; - } - - /** * @return {@code True} if cache store is enabled. */ protected boolean storeEnabled() { @@ -465,7 +450,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst return dataNodes + (storeEnabled() ? 1 : 0); // One call before store is updated. else { // If update goes through primary node and it is cancelled then backups aren't updated. - return (writeOrderMode() == PRIMARY || op == Operation.TRANSFORM) ? 1 : dataNodes; + return op == Operation.TRANSFORM ? 1 : dataNodes; } } @@ -480,7 +465,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst // Update + after update + one call before store is updated. return dataNodes * 2 + (storeEnabled() ? 1 : 0); else - return (writeOrderMode() == PRIMARY || op == Operation.TRANSFORM) ? 2 : dataNodes * 2; + return op == Operation.TRANSFORM ? 2 : dataNodes * 2; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java index 04f18a78c..e4ba56b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java @@ -17,13 +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.CacheInterceptor; import org.apache.ignite.configuration.NearCacheConfiguration; -import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -39,9 +36,4 @@ public class GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest extends GridCac @Override protected NearCacheConfiguration nearConfiguration() { return null; } - - /** {@inheritDoc} */ - @Nullable @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/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java index 28a080c..662dd91 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java @@ -17,12 +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 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.CacheMode.REPLICATED; @@ -40,9 +37,4 @@ public class GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest @Override protected CacheMode cacheMode() { return REPLICATED; } - - /** {@inheritDoc} */ - @Nullable @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/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 59ee339..24bc342 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 @@ -17,12 +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 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.CacheMode.REPLICATED; @@ -39,9 +36,4 @@ public class GridCacheInterceptorAtomicReplicatedSelfTest extends GridCacheInter @Override protected CacheMode cacheMode() { return REPLICATED; } - - /** {@inheritDoc} */ - @Nullable @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/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 80f30fb..de3847e 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 @@ -17,13 +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.CacheInterceptor; import org.apache.ignite.configuration.NearCacheConfiguration; -import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** @@ -39,9 +36,4 @@ public class GridCacheInterceptorAtomicSelfTest extends GridCacheInterceptorAbst @Override protected NearCacheConfiguration nearConfiguration() { return null; } - - /** {@inheritDoc} */ - @Nullable @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/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 a9a0f0e..f12c92e 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 @@ -17,12 +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 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.CacheMode.LOCAL; @@ -36,11 +33,6 @@ public class GridCacheInterceptorLocalAtomicSelfTest extends GridCacheIntercepto } /** {@inheritDoc} */ - @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } - - /** {@inheritDoc} */ @Override protected int gridCount() { return 1; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java index 5802b12..e378504 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.testframework.GridTestUtils; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -56,7 +55,6 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend ccfg.setMemoryMode(OFFHEAP_TIERED); ccfg.setOffHeapMaxMemory(1024 * 1024); 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/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index 23d248d..ff7a09c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@ -37,7 +37,6 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.jetbrains.annotations.Nullable; import org.junit.Assert; -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; @@ -74,8 +73,6 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(PRIMARY); - ccfg.setMemoryMode(OFFHEAP_TIERED); ccfg.setOffHeapMaxMemory(1024 * 1024); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java index cd82739..fc41112 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java @@ -31,7 +31,6 @@ import org.apache.ignite.internal.util.typedef.P1; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.testframework.GridTestUtils; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; @@ -65,8 +64,6 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setAtomicWriteOrderMode(PRIMARY); - ccfg.setMemoryMode(OFFHEAP_TIERED); ccfg.setNearConfiguration(null); ccfg.setOffHeapMaxMemory(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java index 4e1a47c..8a43879 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@ -27,14 +27,12 @@ import java.util.Set; 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.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -48,9 +46,6 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest /** Atomicity mode. */ private CacheAtomicityMode atomicityMode; - /** Atomic write order mode. */ - private CacheAtomicWriteOrderMode writeOrderMode; - /** Number of backups. */ private int backups; @@ -66,7 +61,6 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest ccfg.setBackups(backups); ccfg.setCacheMode(PARTITIONED); ccfg.setAtomicityMode(atomicityMode); - ccfg.setAtomicWriteOrderMode(writeOrderMode); cfg.setCacheConfiguration(ccfg); @@ -86,7 +80,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest // Test works too long and fails. fail("https://issues.apache.org/jira/browse/IGNITE-581";); - checkTransform(TRANSACTIONAL, PRIMARY, 0); + checkTransform(TRANSACTIONAL, 0); } /** @@ -97,24 +91,21 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest // Test works too long and fails. fail("https://issues.apache.org/jira/browse/IGNITE-581";); - checkTransform(TRANSACTIONAL, PRIMARY, 1); + checkTransform(TRANSACTIONAL, 1); } /** * @param mode Atomicity mode. - * @param order Atomic cache write order mode. * @param b Number of backups. * @throws Exception If failed. */ - private void checkTransform(CacheAtomicityMode mode, CacheAtomicWriteOrderMode order, int b) + private void checkTransform(CacheAtomicityMode mode, int b) throws Exception { try { atomicityMode = mode; backups = b; - writeOrderMode = order; - cache = true; startGrids(2); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java index 39ce33d..0e1561e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java @@ -27,7 +27,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryObjectBuilder; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -45,7 +44,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.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -76,13 +74,6 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract } /** - * @return Cache write order mode. - */ - private CacheAtomicWriteOrderMode cacheAtomicWriteOrderMode() { - return PRIMARY; - } - - /** * @return Cache synchronization mode. */ private CacheWriteSynchronizationMode cacheWriteSynchronizationMode() { @@ -127,7 +118,6 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract cc.setStoreKeepBinary(true); cc.setCacheMode(cacheMode()); - cc.setAtomicWriteOrderMode(cacheAtomicWriteOrderMode()); cc.setWriteSynchronizationMode(cacheWriteSynchronizationMode()); cc.setBackups(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 6129505..d61ad39 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 @@ -23,7 +23,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; 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.cluster.ClusterNode; @@ -33,7 +32,6 @@ 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.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; @@ -64,7 +62,6 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach cCfg.setCacheMode(PARTITIONED); cCfg.setAtomicityMode(atomicityMode()); - cCfg.setAtomicWriteOrderMode(writeOrderMode()); cCfg.setNearConfiguration(nearConfiguration()); cCfg.setRebalanceMode(SYNC); cCfg.setWriteSynchronizationMode(FULL_SYNC); @@ -98,13 +95,6 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach } /** - * @return Atomic write order mode. - */ - protected CacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } - - /** * @return Consistency test iteration count. */ protected abstract int iterationCount(); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 6ff540f..d639b43 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 @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache; 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.configuration.CacheConfiguration; @@ -32,7 +31,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -48,9 +46,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest { private CacheAtomicityMode atomicityMode; /** */ - private CacheAtomicWriteOrderMode atomicWriteOrder; - - /** */ private boolean near; /** {@inheritDoc} */ @@ -66,12 +61,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest { ccfg.setAtomicityMode(atomicityMode); - if (atomicityMode == null) { - assert atomicWriteOrder != null; - - ccfg.setAtomicWriteOrderMode(atomicWriteOrder); - } - ccfg.setNearConfiguration(near ? new NearCacheConfiguration() : null); return ccfg; @@ -123,8 +112,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest { public void testVersionAtomicPrimary() throws Exception { atomicityMode = ATOMIC; - atomicWriteOrder = PRIMARY; - checkVersion(); } @@ -134,8 +121,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest { public void testVersionAtomicPrimaryNearEnabled() throws Exception { atomicityMode = ATOMIC; - atomicWriteOrder = PRIMARY; - near = true; checkVersion(); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java index 3e80525..20bcf6c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java @@ -38,7 +38,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -238,7 +237,6 @@ public class GridCacheVersionTopologyChangeTest extends GridCommonAbstractTest { ccfg.setName(name); ccfg.setAtomicityMode(atomicityMode); ccfg.setAffinity(aff); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setWriteSynchronizationMode(FULL_SYNC); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index 45b6e9d..73f6404 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -23,7 +23,6 @@ import javax.cache.configuration.Factory; import javax.cache.integration.CacheLoader; import javax.cache.integration.CacheWriter; 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.CacheWriteSynchronizationMode; @@ -126,12 +125,6 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { cfg.setCacheMode(cacheMode()); cfg.setAtomicityMode(atomicityMode()); - if (atomicityMode() == ATOMIC && cacheMode() != LOCAL) { - assert atomicWriteOrderMode() != null; - - cfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); - } - cfg.setWriteSynchronizationMode(writeSynchronization()); cfg.setNearConfiguration(nearConfiguration()); @@ -192,13 +185,6 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { protected abstract CacheAtomicityMode atomicityMode(); /** - * @return Atomic cache write order mode. - */ - protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return null; - } - - /** * @return Partitioned mode. */ protected abstract NearCacheConfiguration nearConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 379952b..cb05da4 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 @@ -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 IgniteCacheAtomicInvokeTest extends IgniteCacheInvokeAbstractTest { } /** {@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/IgniteCacheAtomicPeekModesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.java index 8b7859a..e8eda9a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.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.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -43,9 +41,4 @@ public class IgniteCacheAtomicPeekModesTest extends IgniteCachePeekModesAbstract @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } - - /** {@inheritDoc} */ - @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { - return PRIMARY; - } }
