Delete write order mode in dotnet platform.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59af0367 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59af0367 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59af0367 Branch: refs/heads/ignite-4587 Commit: 59af0367fe7b74ebb826c1cb57adc8cacf13ee49 Parents: ed3370f Author: Max Kozlov <[email protected]> Authored: Wed Mar 1 23:43:19 2017 +0300 Committer: Max Kozlov <[email protected]> Committed: Wed Mar 1 23:43:19 2017 +0300 ---------------------------------------------------------------------- .../Cache/CacheConfigurationTest.cs | 2 - .../Config/native-client-test-cache.xml | 3 -- .../IgniteConfigurationSerializerTest.cs | 1 - .../Apache.Ignite.Core.csproj | 1 - .../Configuration/CacheAtomicWriteOrderMode.cs | 43 -------------------- .../Cache/Configuration/CacheConfiguration.cs | 7 ---- .../IgniteConfigurationSection.xsd | 12 ------ 7 files changed, 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs index aba289a..47d9b57 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs @@ -493,7 +493,6 @@ namespace Apache.Ignite.Core.Tests.Cache WriteBehindFlushFrequency = TimeSpan.FromSeconds(6), WriteBehindFlushSize = 7, EvictSynchronized = true, - AtomicWriteOrderMode = CacheAtomicWriteOrderMode.Primary, AtomicityMode = CacheAtomicityMode.Atomic, Backups = 8, CacheMode = CacheMode.Partitioned, @@ -588,7 +587,6 @@ namespace Apache.Ignite.Core.Tests.Cache WriteBehindFlushFrequency = TimeSpan.FromSeconds(6), WriteBehindFlushSize = 7, EvictSynchronized = true, - AtomicWriteOrderMode = CacheAtomicWriteOrderMode.Primary, AtomicityMode = CacheAtomicityMode.Transactional, Backups = 8, CacheMode = CacheMode.Partitioned, http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/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 f811823..b514e73 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/59af0367/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 26e04a9..20c0e7d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs @@ -590,7 +590,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/59af0367/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 673449e..edf630c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -219,7 +219,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\CacheMemoryMode.cs" /> <Compile Include="Cache\Configuration\CacheMode.cs" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/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/59af0367/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 2795111..78de9c9 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs @@ -235,7 +235,6 @@ namespace Apache.Ignite.Core.Cache.Configuration internal CacheConfiguration(IBinaryRawReader reader) { AtomicityMode = (CacheAtomicityMode) reader.ReadInt(); - AtomicWriteOrderMode = (CacheAtomicWriteOrderMode) reader.ReadInt(); Backups = reader.ReadInt(); CacheMode = (CacheMode) reader.ReadInt(); CopyOnRead = reader.ReadBoolean(); @@ -292,7 +291,6 @@ namespace Apache.Ignite.Core.Cache.Configuration internal void Write(IBinaryRawWriter writer) { writer.WriteInt((int) AtomicityMode); - writer.WriteInt((int) AtomicWriteOrderMode); writer.WriteInt(Backups); writer.WriteInt((int) CacheMode); writer.WriteBoolean(CopyOnRead); @@ -475,11 +473,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/59af0367/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 d54a200..70a8f95 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="cacheMemoryMode" final="restriction"> <xs:restriction base="xs:string"> <xs:enumeration value="OnheapTiered" /> @@ -594,11 +587,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>
