IGNITE-5446 Always use late affinity assignment mode - update .NET part
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e786beb6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e786beb6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e786beb6 Branch: refs/heads/ignite-2.1 Commit: e786beb64a72906c4e004ce0bed1fa2a9c028a9d Parents: 704032d Author: Pavel Tupitsyn <ptupit...@apache.org> Authored: Tue Jul 11 12:28:43 2017 +0300 Committer: Pavel Tupitsyn <ptupit...@apache.org> Committed: Tue Jul 11 12:28:43 2017 +0300 ---------------------------------------------------------------------- .../platform/utils/PlatformConfigurationUtils.java | 4 ---- .../Cache/Query/CacheQueriesTest.cs | 6 ++++++ .../Apache.Ignite.Core.Tests/Config/cache-query.xml | 1 - .../IgniteConfigurationSerializerTest.cs | 2 -- .../Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs | 3 ++- .../dotnet/Apache.Ignite.Core/IgniteConfiguration.cs | 11 ++++------- 6 files changed, 12 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e786beb6/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 d513071..03b30db 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 @@ -561,8 +561,6 @@ public class PlatformConfigurationUtils { if (in.readBoolean()) cfg.setDaemon(in.readBoolean()); if (in.readBoolean()) - cfg.setLateAffinityAssignment(in.readBoolean()); - if (in.readBoolean()) cfg.setFailureDetectionTimeout(in.readLong()); if (in.readBoolean()) cfg.setClientFailureDetectionTimeout(in.readLong()); @@ -1011,8 +1009,6 @@ public class PlatformConfigurationUtils { w.writeBoolean(true); w.writeBoolean(cfg.isDaemon()); w.writeBoolean(true); - w.writeBoolean(cfg.isLateAffinityAssignment()); - w.writeBoolean(true); w.writeLong(cfg.getFailureDetectionTimeout()); w.writeBoolean(true); w.writeLong(cfg.getClientFailureDetectionTimeout()); http://git-wip-us.apache.org/repos/asf/ignite/blob/e786beb6/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs index ee2806f..4df12a4 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs @@ -907,6 +907,12 @@ namespace Apache.Ignite.Core.Tests.Cache.Query exp.Add(val); } + if (loc) + { + Assert.AreEqual(exp.Count, + cache.GetLocalEntries(CachePeekMode.Primary).Count(x => expectedEntryFilter(x.Key))); + } + return exp; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e786beb6/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml index 4f92c72..2b41efa 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/cache-query.xml @@ -28,7 +28,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="lateAffinityAssignment" value="false"/> <property name="platformConfiguration"> <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration"> http://git-wip-us.apache.org/repos/asf/ignite/blob/e786beb6/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 7e0d941..125902f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs @@ -151,7 +151,6 @@ namespace Apache.Ignite.Core.Tests Assert.AreEqual("c:", cfg.WorkDirectory); Assert.AreEqual("127.1.1.1", cfg.Localhost); Assert.IsTrue(cfg.IsDaemon); - Assert.IsFalse(cfg.IsLateAffinityAssignment); Assert.AreEqual(1024, cfg.JvmMaxMemoryMb); Assert.AreEqual(TimeSpan.FromSeconds(10), cfg.MetricsLogFrequency); Assert.AreEqual(TimeSpan.FromMinutes(1), ((TcpDiscoverySpi)cfg.DiscoverySpi).JoinTimeout); @@ -836,7 +835,6 @@ namespace Apache.Ignite.Core.Tests SocketSendBufferSize = 2045, UnacknowledgedMessagesBufferSize = 3450 }, - IsLateAffinityAssignment = false, SpringConfigUrl = "test", Logger = new IgniteNLogLogger(), FailureDetectionTimeout = TimeSpan.FromMinutes(2), http://git-wip-us.apache.org/repos/asf/ignite/blob/e786beb6/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs index 4902118..81fd226 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs @@ -15,6 +15,7 @@ * limitations under the License. */ +#pragma warning disable 618 // Ignore obsolete, we still need to test them. namespace Apache.Ignite.Core.Tests { using System; @@ -138,7 +139,7 @@ namespace Apache.Ignite.Core.Tests Assert.IsTrue(File.Exists(resCfg.JvmDllPath)); Assert.AreEqual(cfg.Localhost, resCfg.Localhost); Assert.AreEqual(cfg.IsDaemon, resCfg.IsDaemon); - Assert.AreEqual(cfg.IsLateAffinityAssignment, resCfg.IsLateAffinityAssignment); + Assert.AreEqual(IgniteConfiguration.DefaultIsLateAffinityAssignment, resCfg.IsLateAffinityAssignment); Assert.AreEqual(cfg.UserAttributes, resCfg.UserAttributes); var atm = cfg.AtomicConfiguration; http://git-wip-us.apache.org/repos/asf/ignite/blob/e786beb6/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs index 4419e2e..86155a6 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs @@ -146,9 +146,6 @@ namespace Apache.Ignite.Core private bool? _isDaemon; /** */ - private bool? _isLateAffinityAssignment; - - /** */ private bool? _clientMode; /** */ @@ -274,7 +271,6 @@ namespace Apache.Ignite.Core writer.WriteString(WorkDirectory); writer.WriteString(Localhost); writer.WriteBooleanNullable(_isDaemon); - writer.WriteBooleanNullable(_isLateAffinityAssignment); writer.WriteTimeSpanAsLongNullable(_failureDetectionTimeout); writer.WriteTimeSpanAsLongNullable(_clientFailureDetectionTimeout); writer.WriteTimeSpanAsLongNullable(_longQueryWarningTimeout); @@ -525,7 +521,6 @@ namespace Apache.Ignite.Core WorkDirectory = r.ReadString(); Localhost = r.ReadString(); _isDaemon = r.ReadBooleanNullable(); - _isLateAffinityAssignment = r.ReadBooleanNullable(); _failureDetectionTimeout = r.ReadTimeSpanNullable(); _clientFailureDetectionTimeout = r.ReadTimeSpanNullable(); _longQueryWarningTimeout = r.ReadTimeSpanNullable(); @@ -976,10 +971,12 @@ namespace Apache.Ignite.Core /// If not provided, default value is <see cref="DefaultIsLateAffinityAssignment"/>. /// </summary> [DefaultValue(DefaultIsLateAffinityAssignment)] + [Obsolete("No longer supported, always true.")] public bool IsLateAffinityAssignment { - get { return _isLateAffinityAssignment ?? DefaultIsLateAffinityAssignment; } - set { _isLateAffinityAssignment = value; } + get { return DefaultIsLateAffinityAssignment; } + // ReSharper disable once ValueParameterNotUsed + set { /* No-op. */ } } /// <summary>