Repository: ignite Updated Branches: refs/heads/ignite-5072-merge 588ddcb8f -> ff975bca5
IGNITE-5072 NPEs in tests were fixed as niull MemoryPolicyConfiguration doesn't work anymore for MemoryMetrics or PageMemoryNoStore Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff975bca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff975bca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff975bca Branch: refs/heads/ignite-5072-merge Commit: ff975bca51fd6deb79b45323ae22c6496e8b4a4c Parents: 588ddcb Author: Sergey Chugunov <[email protected]> Authored: Thu Apr 27 16:04:07 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Apr 27 16:26:59 2017 +0300 ---------------------------------------------------------------------- examples/config/example-memory-policies.xml | 2 ++ .../apache/ignite/configuration/MemoryConfiguration.java | 2 +- .../internal/pagemem/impl/PageMemoryNoLoadSelfTest.java | 9 ++++++++- .../platforms/cpp/core-test/config/cache-identity-32.xml | 4 +++- modules/platforms/cpp/core-test/config/cache-query-32.xml | 3 ++- .../cpp/core-test/config/cache-query-continuous-32.xml | 3 ++- modules/platforms/cpp/core-test/config/cache-store-32.xml | 3 ++- modules/platforms/cpp/core-test/config/cache-test-32.xml | 3 ++- modules/platforms/cpp/odbc-test/config/queries-test-32.xml | 3 ++- .../cpp/odbc-test/config/queries-test-noodbc-32.xml | 3 ++- 10 files changed, 26 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/examples/config/example-memory-policies.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-memory-policies.xml b/examples/config/example-memory-policies.xml index 83c1971..86c7502 100644 --- a/examples/config/example-memory-policies.xml +++ b/examples/config/example-memory-policies.xml @@ -38,6 +38,8 @@ <property name="defaultMemoryPolicyName" value="Default_Region"/> <!-- Setting the page size to 4 KB --> <property name="pageSize" value="4096"/> + <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/> <!-- Defining several memory policies for different memory regions --> <property name="memoryPolicies"> http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java index 1561f30..46d060e 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java @@ -147,7 +147,7 @@ public class MemoryConfiguration implements Serializable { * * @return {@code this} for chaining. */ - public MemoryConfiguration setSysCacheMaxSize(long sysCacheMaxSize) { + public MemoryConfiguration setSystemCacheMaxSize(long sysCacheMaxSize) { this.sysCacheMaxSize = sysCacheMaxSize; return this; http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java index f0ffe65..84db565 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java @@ -284,7 +284,14 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest { DirectMemoryProvider provider = new MappedFileMemoryProvider(log(), memDir); - return new PageMemoryNoStoreImpl(log(), provider, null, PAGE_SIZE, plcCfg, new MemoryMetricsImpl(plcCfg), true); + return new PageMemoryNoStoreImpl( + log(), + provider, + null, + PAGE_SIZE, + plcCfg, + new MemoryMetricsImpl(plcCfg), + true); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/platforms/cpp/core-test/config/cache-identity-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-identity-32.xml b/modules/platforms/cpp/core-test/config/cache-identity-32.xml index 1053ff0..1d43678 100644 --- a/modules/platforms/cpp/core-test/config/cache-identity-32.xml +++ b/modules/platforms/cpp/core-test/config/cache-identity-32.xml @@ -33,7 +33,9 @@ <bean parent="grid.cfg"> <property name="memoryConfiguration"> <bean class="org.apache.ignite.configuration.MemoryConfiguration"> - <property name="systemCacheMemorySize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/> + <property name="defaultMemoryPolicyName" value="dfltPlc"/> <property name="memoryPolicies"> http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/platforms/cpp/core-test/config/cache-query-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-query-32.xml b/modules/platforms/cpp/core-test/config/cache-query-32.xml index 38c2a15..ddbd690 100644 --- a/modules/platforms/cpp/core-test/config/cache-query-32.xml +++ b/modules/platforms/cpp/core-test/config/cache-query-32.xml @@ -33,7 +33,8 @@ <bean parent="grid.cfg"> <property name="memoryConfiguration"> <bean class="org.apache.ignite.configuration.MemoryConfiguration"> - <property name="systemCacheMemorySize" value="41943040"/> + <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/> <property name="defaultMemoryPolicyName" value="dfltPlc"/> <property name="memoryPolicies"> http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml b/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml index cc79eb1..84a5c60 100644 --- a/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml +++ b/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml @@ -29,7 +29,8 @@ <bean parent="grid.cfg"> <property name="memoryConfiguration"> <bean class="org.apache.ignite.configuration.MemoryConfiguration"> - <property name="systemCacheMemorySize" value="41943040"/> + <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/> <property name="defaultMemoryPolicyName" value="dfltPlc"/> <property name="memoryPolicies"> http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/platforms/cpp/core-test/config/cache-store-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-store-32.xml b/modules/platforms/cpp/core-test/config/cache-store-32.xml index f0192d8..c29fea2 100644 --- a/modules/platforms/cpp/core-test/config/cache-store-32.xml +++ b/modules/platforms/cpp/core-test/config/cache-store-32.xml @@ -33,7 +33,8 @@ <bean parent="grid.cfg"> <property name="memoryConfiguration"> <bean class="org.apache.ignite.configuration.MemoryConfiguration"> - <property name="systemCacheMemorySize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/> <property name="defaultMemoryPolicyName" value="dfltPlc"/> <property name="memoryPolicies"> http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/platforms/cpp/core-test/config/cache-test-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-test-32.xml b/modules/platforms/cpp/core-test/config/cache-test-32.xml index 7d3fab5..889f246 100644 --- a/modules/platforms/cpp/core-test/config/cache-test-32.xml +++ b/modules/platforms/cpp/core-test/config/cache-test-32.xml @@ -33,7 +33,8 @@ <bean parent="grid.cfg"> <property name="memoryConfiguration"> <bean class="org.apache.ignite.configuration.MemoryConfiguration"> - <property name="systemCacheMemorySize" value="41943040"/> + <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/> <property name="defaultMemoryPolicyName" value="dfltPlc"/> <property name="memoryPolicies"> http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/platforms/cpp/odbc-test/config/queries-test-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-32.xml b/modules/platforms/cpp/odbc-test/config/queries-test-32.xml index dd7cfb6..537fffe 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-test-32.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-test-32.xml @@ -30,7 +30,8 @@ <bean parent="queries.cfg"> <property name="memoryConfiguration"> <bean class="org.apache.ignite.configuration.MemoryConfiguration"> - <property name="systemCacheMemorySize" value="41943040"/> + <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/> <property name="defaultMemoryPolicyName" value="dfltPlc"/> <property name="memoryPolicies"> http://git-wip-us.apache.org/repos/asf/ignite/blob/ff975bca/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml b/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml index 8060107..823d148 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml @@ -30,7 +30,8 @@ <bean parent="ignite.cfg"> <property name="memoryConfiguration"> <bean class="org.apache.ignite.configuration.MemoryConfiguration"> - <property name="systemCacheMemorySize" value="41943040"/> + <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/> + <property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/> <property name="defaultMemoryPolicyName" value="dfltPlc"/> <property name="memoryPolicies">
