You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/25 07:51:22 UTC
[2/2] ignite git commit: IGNITE-5024 - Fixing tests
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/5b35ebcd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b35ebcd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b35ebcd
Branch: refs/heads/ignite-5024
Commit: 5b35ebcda51f2e0041dd3ee249ddf8028c8f4b9b
Parents: afa1f96
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Apr 25 10:52:12 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Apr 25 10:52:12 2017 +0300
----------------------------------------------------------------------
.../internal/pagemem/impl/PageMemoryNoStoreImpl.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5b35ebcd/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
index 63abdb8..1d968c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
@@ -199,14 +199,24 @@ public class PageMemoryNoStoreImpl implements PageMemory {
long allocChunkSize = Math.max((maxSize - startSize) / (SEG_CNT - 1), 256 * 1024 * 1024);
+ int lastIdx = 0;
+
for (int i = 1; i < SEG_CNT; i++) {
long allocSize = Math.min(allocChunkSize, maxSize - total);
+ if (allocSize <= 0)
+ break;
+
chunks[i] = allocSize;
total += allocSize;
+
+ lastIdx = i;
}
+ if (lastIdx != SEG_CNT - 1)
+ chunks = Arrays.copyOf(chunks, lastIdx + 1);
+
directMemoryProvider.initialize(chunks);
addSegment(null);