.NET: Remove CacheConfiguration.OffheapMaxMemory, CacheConfiguration.SqlOnheapRowCacheSize
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6dd29eef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6dd29eef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6dd29eef Branch: refs/heads/ignite-3477-master Commit: 6dd29eef599a95d0e3e905dba3aa9500ef994237 Parents: 2fb75c4 Author: Pavel Tupitsyn <[email protected]> Authored: Mon Apr 3 17:20:44 2017 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Mon Apr 3 17:20:44 2017 +0300 ---------------------------------------------------------------------- .../Cache/CacheConfigurationTest.cs | 9 -------- .../IgniteConfigurationSerializerTest.cs | 2 -- .../Cache/Configuration/CacheConfiguration.cs | 23 -------------------- 3 files changed, 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6dd29eef/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 9ef1005..250177d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs @@ -29,7 +29,6 @@ namespace Apache.Ignite.Core.Tests.Cache using Apache.Ignite.Core.Cache.Expiry; using Apache.Ignite.Core.Cache.Store; using Apache.Ignite.Core.Common; - using Apache.Ignite.Core.Impl.Cache.Affinity; using Apache.Ignite.Core.Tests.Plugin.Cache; using NUnit.Framework; @@ -198,13 +197,11 @@ namespace Apache.Ignite.Core.Tests.Cache Assert.AreEqual(CacheConfiguration.DefaultLongQueryWarningTimeout, cfg.LongQueryWarningTimeout); Assert.AreEqual(CacheConfiguration.DefaultMaxConcurrentAsyncOperations, cfg.MaxConcurrentAsyncOperations); Assert.AreEqual(CacheConfiguration.DefaultMaxEvictionOverflowRatio, cfg.MaxEvictionOverflowRatio); - Assert.AreEqual(CacheConfiguration.DefaultOffHeapMaxMemory, cfg.OffHeapMaxMemory); Assert.AreEqual(CacheConfiguration.DefaultReadFromBackup, cfg.ReadFromBackup); Assert.AreEqual(CacheConfiguration.DefaultRebalanceBatchSize, cfg.RebalanceBatchSize); Assert.AreEqual(CacheConfiguration.DefaultRebalanceMode, cfg.RebalanceMode); Assert.AreEqual(CacheConfiguration.DefaultRebalanceThrottle, cfg.RebalanceThrottle); Assert.AreEqual(CacheConfiguration.DefaultRebalanceTimeout, cfg.RebalanceTimeout); - Assert.AreEqual(CacheConfiguration.DefaultSqlOnheapRowCacheSize, cfg.SqlOnheapRowCacheSize); Assert.AreEqual(CacheConfiguration.DefaultStartSize, cfg.StartSize); Assert.AreEqual(CacheConfiguration.DefaultStartSize, cfg.StartSize); Assert.AreEqual(CacheConfiguration.DefaultWriteBehindBatchSize, cfg.WriteBehindBatchSize); @@ -235,13 +232,11 @@ namespace Apache.Ignite.Core.Tests.Cache Assert.AreEqual(x.LongQueryWarningTimeout, y.LongQueryWarningTimeout); Assert.AreEqual(x.MaxConcurrentAsyncOperations, y.MaxConcurrentAsyncOperations); Assert.AreEqual(x.MaxEvictionOverflowRatio, y.MaxEvictionOverflowRatio); - Assert.AreEqual(x.OffHeapMaxMemory, y.OffHeapMaxMemory); Assert.AreEqual(x.ReadFromBackup, y.ReadFromBackup); Assert.AreEqual(x.RebalanceBatchSize, y.RebalanceBatchSize); Assert.AreEqual(x.RebalanceMode, y.RebalanceMode); Assert.AreEqual(x.RebalanceThrottle, y.RebalanceThrottle); Assert.AreEqual(x.RebalanceTimeout, y.RebalanceTimeout); - Assert.AreEqual(x.SqlOnheapRowCacheSize, y.SqlOnheapRowCacheSize); Assert.AreEqual(x.StartSize, y.StartSize); Assert.AreEqual(x.StartSize, y.StartSize); Assert.AreEqual(x.WriteBehindBatchSize, y.WriteBehindBatchSize); @@ -487,7 +482,6 @@ namespace Apache.Ignite.Core.Tests.Cache return new CacheConfiguration { Name = name ?? CacheName, - OffHeapMaxMemory = 1, StartSize = 2, MaxConcurrentAsyncOperations = 3, WriteBehindFlushThreadCount = 4, @@ -516,7 +510,6 @@ namespace Apache.Ignite.Core.Tests.Cache RebalanceThrottle = TimeSpan.FromSeconds(15), RebalanceTimeout = TimeSpan.FromSeconds(16), SqlEscapeAll = true, - SqlOnheapRowCacheSize = 17, WriteBehindBatchSize = 18, WriteBehindEnabled = false, WriteSynchronizationMode = CacheWriteSynchronizationMode.PrimarySync, @@ -581,7 +574,6 @@ namespace Apache.Ignite.Core.Tests.Cache return new CacheConfiguration { Name = name ?? CacheName2, - OffHeapMaxMemory = 1, StartSize = 2, MaxConcurrentAsyncOperations = 3, WriteBehindFlushThreadCount = 4, @@ -610,7 +602,6 @@ namespace Apache.Ignite.Core.Tests.Cache RebalanceThrottle = TimeSpan.FromSeconds(15), RebalanceTimeout = TimeSpan.FromSeconds(16), SqlEscapeAll = true, - SqlOnheapRowCacheSize = 17, WriteBehindBatchSize = 18, WriteBehindEnabled = false, WriteSynchronizationMode = CacheWriteSynchronizationMode.PrimarySync, http://git-wip-us.apache.org/repos/asf/ignite/blob/6dd29eef/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 7e44a7a..e6e12c4 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs @@ -626,7 +626,6 @@ namespace Apache.Ignite.Core.Tests LongQueryWarningTimeout = TimeSpan.FromSeconds(99), MaxConcurrentAsyncOperations = 24, MaxEvictionOverflowRatio = 5.6F, - OffHeapMaxMemory = 567, QueryEntities = new[] { new QueryEntity @@ -655,7 +654,6 @@ namespace Apache.Ignite.Core.Tests RebalanceThrottle = TimeSpan.FromHours(44), RebalanceTimeout = TimeSpan.FromMinutes(8), SqlEscapeAll = true, - SqlOnheapRowCacheSize = 679, StartSize = 1023, WriteBehindBatchSize = 45, WriteBehindEnabled = true, http://git-wip-us.apache.org/repos/asf/ignite/blob/6dd29eef/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 9ae3f6c..a5b9712 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs @@ -182,13 +182,11 @@ namespace Apache.Ignite.Core.Cache.Configuration LongQueryWarningTimeout = DefaultLongQueryWarningTimeout; MaxConcurrentAsyncOperations = DefaultMaxConcurrentAsyncOperations; MaxEvictionOverflowRatio = DefaultMaxEvictionOverflowRatio; - OffHeapMaxMemory = DefaultOffHeapMaxMemory; ReadFromBackup = DefaultReadFromBackup; RebalanceBatchSize = DefaultRebalanceBatchSize; RebalanceMode = DefaultRebalanceMode; RebalanceThrottle = DefaultRebalanceThrottle; RebalanceTimeout = DefaultRebalanceTimeout; - SqlOnheapRowCacheSize = DefaultSqlOnheapRowCacheSize; StartSize = DefaultStartSize; WriteBehindBatchSize = DefaultWriteBehindBatchSize; WriteBehindEnabled = DefaultWriteBehindEnabled; @@ -248,7 +246,6 @@ namespace Apache.Ignite.Core.Cache.Configuration MaxConcurrentAsyncOperations = reader.ReadInt(); MaxEvictionOverflowRatio = reader.ReadFloat(); Name = reader.ReadString(); - OffHeapMaxMemory = reader.ReadLong(); ReadFromBackup = reader.ReadBoolean(); RebalanceBatchSize = reader.ReadInt(); RebalanceDelay = reader.ReadLongAsTimespan(); @@ -256,7 +253,6 @@ namespace Apache.Ignite.Core.Cache.Configuration RebalanceThrottle = reader.ReadLongAsTimespan(); RebalanceTimeout = reader.ReadLongAsTimespan(); SqlEscapeAll = reader.ReadBoolean(); - SqlOnheapRowCacheSize = reader.ReadInt(); StartSize = reader.ReadInt(); WriteBehindBatchSize = reader.ReadInt(); WriteBehindEnabled = reader.ReadBoolean(); @@ -311,7 +307,6 @@ namespace Apache.Ignite.Core.Cache.Configuration writer.WriteInt(MaxConcurrentAsyncOperations); writer.WriteFloat(MaxEvictionOverflowRatio); writer.WriteString(Name); - writer.WriteLong(OffHeapMaxMemory); writer.WriteBoolean(ReadFromBackup); writer.WriteInt(RebalanceBatchSize); writer.WriteLong((long) RebalanceDelay.TotalMilliseconds); @@ -319,7 +314,6 @@ namespace Apache.Ignite.Core.Cache.Configuration writer.WriteLong((long) RebalanceThrottle.TotalMilliseconds); writer.WriteLong((long) RebalanceTimeout.TotalMilliseconds); writer.WriteBoolean(SqlEscapeAll); - writer.WriteInt(SqlOnheapRowCacheSize); writer.WriteInt(StartSize); writer.WriteInt(WriteBehindBatchSize); writer.WriteBoolean(WriteBehindEnabled); @@ -621,16 +615,6 @@ namespace Apache.Ignite.Core.Cache.Configuration public TimeSpan RebalanceThrottle { get; set; } /// <summary> - /// Gets or sets maximum amount of memory available to off-heap storage. Possible values are - /// -1 means that off-heap storage is disabled. 0 means that Ignite will not limit off-heap storage - /// (it's up to user to properly add and remove entries from cache to ensure that off-heap storage - /// does not grow indefinitely. - /// Any positive value specifies the limit of off-heap storage in bytes. - /// </summary> - [DefaultValue(DefaultOffHeapMaxMemory)] - public long OffHeapMaxMemory { get; set; } - - /// <summary> /// Gets or sets flag indicating whether data can be read from backup. /// </summary> [DefaultValue(DefaultReadFromBackup)] @@ -657,13 +641,6 @@ namespace Apache.Ignite.Core.Cache.Configuration public bool SqlEscapeAll { get; set; } /// <summary> - /// Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access. - /// This setting only makes sense when offheap is enabled for this cache. - /// </summary> - [DefaultValue(DefaultSqlOnheapRowCacheSize)] - public int SqlOnheapRowCacheSize { get; set; } - - /// <summary> /// Gets or sets the factory for underlying persistent storage for read-through and write-through operations. /// <para /> /// See <see cref="ReadThrough"/> and <see cref="WriteThrough"/> properties to enable read-through and
