You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2017/04/25 15:55:32 UTC
ignite git commit: .NET: Tests fixed
Repository: ignite
Updated Branches:
refs/heads/ignite-5024 29402d00b -> b4034f83d
.NET: Tests fixed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4034f83
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4034f83
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4034f83
Branch: refs/heads/ignite-5024
Commit: b4034f83d13dd614ef49660ba0c066bd0caa3d8a
Parents: 29402d0
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Tue Apr 25 18:55:20 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Tue Apr 25 18:55:20 2017 +0300
----------------------------------------------------------------------
.../IgniteConfigurationSerializerTest.cs | 7 ++++---
.../dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd | 7 ++++++-
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4034f83/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 6a7aef0..930e1d8 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
@@ -136,7 +136,7 @@ namespace Apache.Ignite.Core.Tests
<eventStorageSpi type='MemoryEventStorageSpi' expirationTimeout='00:00:23.45' maxEventCount='129' />
<memoryConfiguration concurrencyLevel='3' defaultMemoryPolicyName='dfPlc' pageSize='45' systemCacheMemorySize='67'>
<memoryPolicies>
- <memoryPolicyConfiguration emptyPagesPoolSize='1' evictionThreshold='0.2' name='dfPlc' pageEvictionMode='RandomLru' size='89' swapFilePath='abc' />
+ <memoryPolicyConfiguration emptyPagesPoolSize='1' evictionThreshold='0.2' name='dfPlc' pageEvictionMode='RandomLru' initialSize='89' maxSize='98' swapFilePath='abc' />
</memoryPolicies>
</memoryConfiguration>
</igniteConfig>";
@@ -269,7 +269,8 @@ namespace Apache.Ignite.Core.Tests
Assert.AreEqual("dfPlc", memPlc.Name);
Assert.AreEqual(DataPageEvictionMode.RandomLru, memPlc.PageEvictionMode);
Assert.AreEqual("abc", memPlc.SwapFilePath);
- Assert.AreEqual(89, memPlc.MaxSize);
+ Assert.AreEqual(89, memPlc.InitialSize);
+ Assert.AreEqual(98, memPlc.MaxSize);
}
/// <summary>
@@ -812,6 +813,7 @@ namespace Apache.Ignite.Core.Tests
{
Name = "myDefaultPlc",
PageEvictionMode = DataPageEvictionMode.Random2Lru,
+ InitialSize = 245 * 1024 * 1024,
MaxSize = 345 * 1024 * 1024,
EvictionThreshold = 0.88,
EmptyPagesPoolSize = 77,
@@ -821,7 +823,6 @@ namespace Apache.Ignite.Core.Tests
{
Name = "customPlc",
PageEvictionMode = DataPageEvictionMode.RandomLru,
- MaxSize = 456 * 1024 * 1024,
EvictionThreshold = 0.77,
EmptyPagesPoolSize = 66,
SwapFilePath = "somePath2"
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4034f83/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 67f2715..0ecac68 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
@@ -1189,7 +1189,12 @@
<xs:documentation>Page eviction mode.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="size" type="xs:int" use="required">
+ <xs:attribute name="initialSize" type="xs:long">
+ <xs:annotation>
+ <xs:documentation>Initial memory region size defined by this memory policy.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="maxSize" type="xs:long">
<xs:annotation>
<xs:documentation>Maximum memory region size defined by this memory policy.</xs:documentation>
</xs:annotation>