http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java index 8882686..c1f6989 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java @@ -38,7 +38,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -141,7 +140,6 @@ public class IgniteCacheDistributedJoinCustomAffinityMapper extends GridCommonAb ccfg.setName(name); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setAtomicityMode(ATOMIC); ccfg.setBackups(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java index 9a11c3d..5acd801 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java @@ -40,7 +40,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.CacheWriteSynchronizationMode.FULL_SYNC; @@ -113,7 +112,6 @@ public class IgniteCacheDistributedJoinNoIndexTest extends GridCommonAbstractTes ccfg.setName(name); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setAtomicityMode(ATOMIC); ccfg.setBackups(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java index 7c3750a..5ef53eb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java @@ -39,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.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -87,7 +86,6 @@ public class IgniteCacheDistributedJoinPartitionedAndReplicatedTest extends Grid ccfg.setName(name); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setAtomicityMode(ATOMIC); ccfg.setCacheMode(cacheMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java index 200ca87..f11bcd1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java @@ -37,7 +37,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.CacheWriteSynchronizationMode.FULL_SYNC; @@ -564,7 +563,6 @@ public class IgniteCacheDistributedJoinQueryConditionsTest extends GridCommonAbs ccfg.setName(name); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setAtomicityMode(ATOMIC); ccfg.setBackups(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java index bb530b3..2d0e588 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java @@ -38,7 +38,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -138,7 +137,6 @@ public class IgniteCacheJoinPartitionedAndReplicatedCollocationTest extends Abst ccfg.setName(name); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setAtomicityMode(ATOMIC); ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java index 1d27d22..aa31f33 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java @@ -38,7 +38,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -134,7 +133,6 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr ccfg.setName(name); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setAtomicWriteOrderMode(PRIMARY); ccfg.setAtomicityMode(ATOMIC); ccfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java index 052174e..2aa3419 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java @@ -18,11 +18,11 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverAtomicSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverTxSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicReplicatedSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxReplicatedSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxSelfTest; @@ -38,12 +38,12 @@ public class IgniteCacheQuerySelfTestSuite4 extends TestSuite { TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite 4"); // Continuous queries failover tests. - suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverAtomicSelfTest.class); suite.addTestSuite(CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class); suite.addTestSuite(CacheContinuousQueryFailoverTxSelfTest.class); suite.addTestSuite(CacheContinuousQueryFailoverTxReplicatedSelfTest.class); - suite.addTestSuite(CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.class); + suite.addTestSuite(CacheContinuousQueryAsyncFailoverAtomicSelfTest.class); suite.addTestSuite(CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest.class); suite.addTestSuite(CacheContinuousQueryAsyncFailoverTxSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml index 9f2e5d6..db07ad5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml @@ -60,7 +60,6 @@ <property name="name" value="partitioned_atomic"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="startSize" value="10"/> </bean> @@ -78,7 +77,6 @@ <property name="name" value="partitioned_atomic_near"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="nearConfiguration"> <bean class="org.apache.ignite.configuration.NearCacheConfiguration" /> </property> @@ -96,7 +94,6 @@ <property name="name" value="replicated_atomic"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> <property name="startSize" value="10"/> </bean> http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs index d649637..8e10539 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs @@ -609,7 +609,6 @@ namespace Apache.Ignite.Core.Tests { new CacheConfiguration("cacheName") { - AtomicWriteOrderMode = CacheAtomicWriteOrderMode.Primary, AtomicityMode = CacheAtomicityMode.Transactional, Backups = 15, CacheMode = CacheMode.Replicated, http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj index 3ee705d..a1307e7 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -222,7 +222,6 @@ <Compile Include="Compute\IComputeReducer.cs" /> <Compile Include="Compute\IComputeTask.cs" /> <Compile Include="Cache\Configuration\CacheAtomicityMode.cs" /> - <Compile Include="Cache\Configuration\CacheAtomicWriteOrderMode.cs" /> <Compile Include="Cache\Configuration\CacheConfiguration.cs" /> <Compile Include="Cache\Configuration\CacheMode.cs" /> <Compile Include="Cache\Configuration\CacheRebalanceMode.cs" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheAtomicWriteOrderMode.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheAtomicWriteOrderMode.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheAtomicWriteOrderMode.cs deleted file mode 100644 index c9a41e8..0000000 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheAtomicWriteOrderMode.cs +++ /dev/null @@ -1,43 +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. - */ - -namespace Apache.Ignite.Core.Cache.Configuration -{ - /// <summary> - /// Cache write ordering mode. This enumeration is taken into account only in - /// <see cref="CacheAtomicityMode.Atomic"/> atomicity mode. - /// Write ordering mode determines which node assigns the write version, sender or the primary node. - /// </summary> - public enum CacheAtomicWriteOrderMode - { - /// <summary> - /// In this mode, write versions are assigned on a sender node which generally leads to better - /// performance in <see cref="CacheWriteSynchronizationMode.FullSync"/> synchronization mode, - /// since in this case sender can send write requests to primary and backups at the same time. - /// <para/> - /// This mode will be automatically configured only with <see cref="CacheWriteSynchronizationMode.FullSync"/> - /// write synchronization mode, as for other synchronization modes it does not render better performance. - /// </summary> - Clock, - - /// <summary> - /// 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. - /// </summary> - Primary - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs index cff054d..a16edfb 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs @@ -205,7 +205,6 @@ namespace Apache.Ignite.Core.Cache.Configuration Debug.Assert(((BinaryReader) reader).Marshaller == BinaryUtils.Marshaller); AtomicityMode = (CacheAtomicityMode) reader.ReadInt(); - AtomicWriteOrderMode = (CacheAtomicWriteOrderMode) reader.ReadInt(); Backups = reader.ReadInt(); CacheMode = (CacheMode) reader.ReadInt(); CopyOnRead = reader.ReadBoolean(); @@ -261,7 +260,6 @@ namespace Apache.Ignite.Core.Cache.Configuration Debug.Assert(((BinaryWriter) writer).Marshaller == BinaryUtils.Marshaller); writer.WriteInt((int) AtomicityMode); - writer.WriteInt((int) AtomicWriteOrderMode); writer.WriteInt(Backups); writer.WriteInt((int) CacheMode); writer.WriteBoolean(CopyOnRead); @@ -424,11 +422,6 @@ namespace Apache.Ignite.Core.Cache.Configuration public CacheAtomicityMode AtomicityMode { get; set; } /// <summary> - /// Gets or sets cache write ordering mode. - /// </summary> - public CacheAtomicWriteOrderMode AtomicWriteOrderMode { get; set; } - - /// <summary> /// Gets or sets number of nodes used to back up single partition for /// <see cref="Configuration.CacheMode.Partitioned"/> cache. /// </summary> http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd index 9859b2d..b503338 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd +++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd @@ -39,13 +39,6 @@ </xs:restriction> </xs:simpleType> - <xs:simpleType name="cacheAtomicWriteOrderMode" final="restriction"> - <xs:restriction base="xs:string"> - <xs:enumeration value="Clock" /> - <xs:enumeration value="Primary" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="cacheRebalanceMode" final="restriction"> <xs:restriction base="xs:string"> <xs:enumeration value="Sync" /> @@ -571,11 +564,6 @@ <xs:documentation>Cache atomicity mode.</xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="atomicWriteOrderMode" type="cacheAtomicWriteOrderMode"> - <xs:annotation> - <xs:documentation>Cache write ordering mode.</xs:documentation> - </xs:annotation> - </xs:attribute> <xs:attribute name="backups" type="xs:int"> <xs:annotation> <xs:documentation> http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala index 3fd9555..1fb78b8 100755 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala @@ -839,7 +839,6 @@ object VisorCacheCommand { cacheT += ("Mode", cfg.getMode) cacheT += ("Atomicity Mode", safe(cfg.getAtomicityMode)) - cacheT += ("Atomic Write Ordering Mode", safe(cfg.getAtomicWriteOrderMode)) cacheT += ("Statistic Enabled", bool2Str(cfg.isStatisticsEnabled)) cacheT += ("Management Enabled", bool2Str(cfg.isManagementEnabled)) http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/web-console/backend/app/mongo.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js index 0da9aa9..0e1aad7 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -262,7 +262,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose invalidate: Boolean, defaultLockTimeout: Number, - atomicWriteOrderMode: {type: String, enum: ['CLOCK', 'PRIMARY']}, writeSynchronizationMode: {type: String, enum: ['FULL_SYNC', 'FULL_ASYNC', 'PRIMARY_SYNC']}, sqlEscapeAll: Boolean, @@ -556,8 +555,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose compactFooter: Boolean }, caches: [{type: ObjectId, ref: 'Cache'}], - clockSyncSamples: Number, - clockSyncFrequency: Number, deploymentMode: {type: String, enum: ['PRIVATE', 'ISOLATED', 'SHARED', 'CONTINUOUS']}, discoveryStartupDelay: Number, igfsThreadPoolSize: Number, http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js index f88736a..f928459 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -1276,9 +1276,7 @@ export default class IgniteConfigurationGenerator { // Generate time group. static clusterTime(cluster, cfg = this.igniteConfigurationBean(cluster)) { - cfg.intProperty('clockSyncSamples') - .intProperty('clockSyncFrequency') - .intProperty('timeServerPortBase') + cfg.intProperty('timeServerPortBase') .intProperty('timeServerPortRange'); return cfg; @@ -1627,7 +1625,6 @@ export default class IgniteConfigurationGenerator { static cacheConcurrency(cache, ccfg = this.cacheConfigurationBean(cache)) { ccfg.intProperty('maxConcurrentAsyncOperations') .intProperty('defaultLockTimeout') - .enumProperty('atomicWriteOrderMode') .enumProperty('writeSynchronizationMode'); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js index a78f078..807303d 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js @@ -410,7 +410,6 @@ export default ['JavaTypes', 'igniteClusterPlatformDefaults', 'igniteCachePlatfo static cacheConcurrency(cache, ccfg = this.cacheConfigurationBean(cache)) { ccfg.intProperty('maxConcurrentAsyncOperations') .intProperty('defaultLockTimeout') - .enumProperty('atomicWriteOrderMode') .enumProperty('writeSynchronizationMode'); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js index 3253ba9..c9720cd 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js @@ -28,10 +28,6 @@ const DFLT_CACHE = { clsName: 'Apache.Ignite.Core.Cache.Configuration.CacheAtomicityMode', mapper: enumValueMapper }, - atomicWriteOrderMode: { - clsName: 'org.apache.ignite.cache.CacheAtomicWriteOrderMode', - mapper: enumValueMapper - }, writeSynchronizationMode: { clsName: 'org.apache.ignite.cache.CacheWriteSynchronizationMode', value: 'PRIMARY_SYNC', http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js index 1a4c7c9..4efc892 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js @@ -50,9 +50,6 @@ const DFLT_CACHE = { writeBehindFlushThreadCount: 1, maxConcurrentAsyncOperations: 500, defaultLockTimeout: 0, - atomicWriteOrderMode: { - clsName: 'org.apache.ignite.cache.CacheAtomicWriteOrderMode' - }, writeSynchronizationMode: { clsName: 'org.apache.ignite.cache.CacheWriteSynchronizationMode', value: 'PRIMARY_SYNC' http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js index 8dcd6bc..60f52a6 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js @@ -186,8 +186,6 @@ const DFLT_CLUSTER = { metricsHistorySize: 10000, metricsLogFrequency: 60000, metricsUpdateFrequency: 2000, - clockSyncSamples: 8, - clockSyncFrequency: 120000, timeServerPortBase: 31100, timeServerPortRange: 100, transactionConfiguration: { http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug b/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug index 6458fbb..92bc8ab 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug @@ -37,17 +37,6 @@ include /app/helpers/jade/mixins +number('Default lock timeout:', `${model}.defaultLockTimeout`, '"defaultLockTimeout"', 'true', '0', '0', 'Default lock acquisition timeout in milliseconds<br/>\ If <b>0</b> then lock acquisition will never timeout') - .settings-row(ng-hide=`${model}.atomicityMode === 'TRANSACTIONAL'`) - +dropdown('Entry versioning:', `${model}.atomicWriteOrderMode`, '"atomicWriteOrderMode"', 'true', 'Choose versioning', - '[\ - {value: "CLOCK", label: "CLOCK"},\ - {value: "PRIMARY", label: "PRIMARY"}\ - ]', - 'Write ordering mode determines which node assigns the write version, sender or the primary node\ - <ul>\ - <li>CLOCK - in this mode write versions are assigned on a sender node which generally leads to better performance</li>\ - <li>PRIMARY - in this mode 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</li>\ - </ul>') .settings-row +dropdown('Write synchronization mode:', `${model}.writeSynchronizationMode`, '"writeSynchronizationMode"', 'true', 'PRIMARY_SYNC', '[\ http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug index da781ba..1645a60 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug @@ -30,15 +30,7 @@ include /app/helpers/jade/mixins .panel-body(ng-if=`ui.isPanelLoaded('${form}')`) .col-sm-6 .settings-row - +number('Samples size:', `${model}.clockSyncSamples`, '"clockSyncSamples"', 'true', '8', '0', - 'Number of samples used to synchronize clocks between different nodes<br/>\ - Clock synchronization is used for cache version assignment in CLOCK order mode') - .settings-row - +number('Frequency:', `${model}.clockSyncFrequency`, '"clockSyncFrequency"', 'true', '120000', '0', - 'Frequency at which clock is synchronized between nodes, in milliseconds<br/>\ - Clock synchronization is used for cache version assignment in CLOCK order mode') - .settings-row - +number-min-max('Port base:', `${model}.timeServerPortBase`, '"timeServerPortBase"', 'true', '31100', '0', '65535', + +number-min-max('Port base:', model + '.timeServerPortBase', '"timeServerPortBase"', 'true', '31100', '0', '65535', 'Time server provides clock synchronization between nodes<br/>\ Base UPD port number for grid time server. Time server will be started on one of free ports in range') .settings-row http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/yardstick/README.txt ---------------------------------------------------------------------- diff --git a/modules/yardstick/README.txt b/modules/yardstick/README.txt index c21ed2a..b54bf27 100644 --- a/modules/yardstick/README.txt +++ b/modules/yardstick/README.txt @@ -130,7 +130,6 @@ would behave like a `servers`. `PESSIMISTIC` (defined in `CacheTxConcurrency`) * `-txi <value>` or `--txIsolation <value>` - Cache transaction isolation (defined in `CacheTxIsolation`) * `-wb` or `--writeBehind` - Enable or disable writeBehind for cache store -* `-wom <mode>` or `--writeOrderMode <mode>` - Write order mode for ATOMIC caches (defined in `CacheAtomicWriteOrderMode`) For example if we need to run 2 `IgniteNode` servers on localhost with `PutBenchmark` benchmark on localhost, with number of backups set to 1, synchronization mode set to `PRIMARY_SYNC`, then the following configuration http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java index e096caf..ea48bf3 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java @@ -18,7 +18,6 @@ package org.apache.ignite.yardstick; import com.beust.jcommander.Parameter; -import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.internal.util.tostring.GridToStringBuilder; @@ -66,10 +65,6 @@ public class IgniteBenchmarkArguments { private int nearCacheSize; /** */ - @Parameter(names = {"-wom", "--writeOrderMode"}, description = "Write ordering mode") - private CacheAtomicWriteOrderMode orderMode; - - /** */ @Parameter(names = {"-txc", "--txConcurrency"}, description = "Transaction concurrency") private TransactionConcurrency txConcurrency = TransactionConcurrency.PESSIMISTIC; @@ -273,13 +268,6 @@ public class IgniteBenchmarkArguments { } /** - * @return Cache write ordering mode. - */ - public CacheAtomicWriteOrderMode orderMode() { - return orderMode; - } - - /** * @return Backups. */ public int backups() { @@ -438,8 +426,7 @@ public class IgniteBenchmarkArguments { */ public String description() { return "-nn=" + nodes + "-b=" + backups + "-sm=" + syncMode + "-cl=" + clientOnly + "-nc=" + nearCacheFlag + - (orderMode == null ? "" : "-wom=" + orderMode) + "-txc=" + txConcurrency + "-rd=" + restartDelay + - "-rs=" + restartSleep; + "-txc=" + txConcurrency + "-rd=" + restartDelay + "-rs=" + restartSleep; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/247282f3/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index 59b31f9..029c0fd 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -109,9 +109,6 @@ public class IgniteNode implements BenchmarkServer { cc.setWriteSynchronizationMode(args.syncMode()); - if (args.orderMode() != null) - cc.setAtomicWriteOrderMode(args.orderMode()); - cc.setBackups(args.backups()); if (args.restTcpPort() != 0) {
