IGNITE-5024 - Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/777bd776 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/777bd776 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/777bd776 Branch: refs/heads/ignite-5024 Commit: 777bd7763fe534ba88a9834c87f0c297832093c4 Parents: df7da50 Author: Alexey Goncharuk <[email protected]> Authored: Mon Apr 24 11:21:59 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Apr 24 11:21:59 2017 +0300 ---------------------------------------------------------------------- .../processors/platform/utils/PlatformConfigurationUtils.java | 4 ++-- .../internal/processors/database/BPlusTreeSelfTest.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/777bd776/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 4186eb9..5fdcc6a 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 @@ -1343,7 +1343,7 @@ public class PlatformConfigurationUtils { MemoryPolicyConfiguration cfg = new MemoryPolicyConfiguration(); cfg.setName(in.readString()) - .setSize(in.readLong()) + .setMaxSize(in.readLong()) .setSwapFilePath(in.readString()) .setPageEvictionMode(DataPageEvictionMode.values()[in.readInt()]) .setEvictionThreshold(in.readDouble()) @@ -1384,7 +1384,7 @@ public class PlatformConfigurationUtils { for (MemoryPolicyConfiguration plc : plcs) { w.writeString(plc.getName()); - w.writeLong(plc.getSize()); + w.writeLong(plc.getMaxSize()); w.writeString(plc.getSwapFilePath()); w.writeInt(plc.getPageEvictionMode().ordinal()); w.writeDouble(plc.getEvictionThreshold()); http://git-wip-us.apache.org/repos/asf/ignite/blob/777bd776/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java index bf25349..5f9a3c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongArray; import java.util.concurrent.locks.Lock; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.MemoryPolicyConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryProvider; import org.apache.ignite.internal.pagemem.FullPageId; @@ -629,7 +630,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest { Map<Long,Long> map = new HashMap<>(); - int loops = reuseList == null ? 100_000 : 300_000; + int loops = reuseList == null ? 20_000 : 60_000; for (int i = 0 ; i < loops; i++) { final Long x = (long)BPlusTree.randomInt(CNT); @@ -1232,7 +1233,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest { final Map<Long,Long> map = new ConcurrentHashMap8<>(); - final int loops = reuseList == null ? 100_000 : 200_000; + final int loops = reuseList == null ? 20_000 : 60_000; final GridStripedLock lock = new GridStripedLock(256); @@ -1707,7 +1708,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest { new UnsafeMemoryProvider(log), null, PAGE_SIZE, - null, + new MemoryPolicyConfiguration().setMaxSize(5 * 1024 * MB), new MemoryMetricsImpl(null), true); pageMem.start();
