IGNITE-5479 - Clean up public API
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/727df187 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/727df187 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/727df187 Branch: refs/heads/ignite-5479 Commit: 727df1871d40db6f1c5c4faac33488255fccb0d1 Parents: 8a64081 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Tue Jul 11 15:26:11 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Jul 11 15:26:11 2017 +0300 ---------------------------------------------------------------------- .../ignite/configuration/MemoryConfiguration.java | 2 +- .../ignite/configuration/MemoryPolicyConfiguration.java | 2 +- .../persistence/IgniteCacheDatabaseSharedManager.java | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/727df187/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 5cf6cb7..97392de 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 @@ -64,7 +64,7 @@ public class MemoryConfiguration implements Serializable { /** Default memory policy start size (256 MB). */ @SuppressWarnings("UnnecessaryBoxing") - public static final Long DFLT_MEMORY_POLICY_INITIAL_SIZE = new Long(256L * 1024 * 1024); + public static final long DFLT_MEMORY_POLICY_INITIAL_SIZE = 256L * 1024 * 1024; /** Fraction of available memory to allocate for default MemoryPolicy. */ private static final double DFLT_MEMORY_POLICY_FRACTION = 0.8; http://git-wip-us.apache.org/repos/asf/ignite/blob/727df187/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java index b496901..fec20d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java @@ -78,7 +78,7 @@ public final class MemoryPolicyConfiguration implements Serializable { private String name = DFLT_MEM_PLC_DEFAULT_NAME; /** Memory policy start size. */ - private Long initialSize = MemoryConfiguration.DFLT_MEMORY_POLICY_INITIAL_SIZE; + private long initialSize; /** Memory policy maximum size. */ private long maxSize = MemoryConfiguration.DFLT_MEMORY_POLICY_MAX_SIZE; http://git-wip-us.apache.org/repos/asf/ignite/blob/727df187/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java index c5f174c..8d03689 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java @@ -454,6 +454,14 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap * @throws IgniteCheckedException If config is invalid. */ private void checkPolicySize(MemoryPolicyConfiguration plcCfg) throws IgniteCheckedException { + boolean dfltInitSize = false; + + if (plcCfg.getInitialSize() == 0) { + plcCfg.setInitialSize(DFLT_MEMORY_POLICY_INITIAL_SIZE); + + dfltInitSize = true; + } + if (plcCfg.getInitialSize() < MIN_PAGE_MEMORY_SIZE) throw new IgniteCheckedException("MemoryPolicy must have size more than 10MB (use " + "MemoryPolicyConfiguration.initialSize property to set correct size in bytes) " + @@ -461,8 +469,8 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap ); if (plcCfg.getMaxSize() < plcCfg.getInitialSize()) { - // We will know for sure if initialSize has been changed if we compare Longs by "==". - if (plcCfg.getInitialSize() == DFLT_MEMORY_POLICY_INITIAL_SIZE) { + // If initial size was not set, use the max size. + if (dfltInitSize) { plcCfg.setInitialSize(plcCfg.getMaxSize()); LT.warn(log, "MemoryPolicy maxSize=" + U.readableSize(plcCfg.getMaxSize(), true) +
