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/27 12:55:11 UTC
ignite git commit: IGNITE-5072 - Fixing tests
Repository: ignite
Updated Branches:
refs/heads/ignite-5072-merge 83ba164e8 -> fe50d761e
IGNITE-5072 - Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe50d761
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe50d761
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe50d761
Branch: refs/heads/ignite-5072-merge
Commit: fe50d761e56751f520dee97281fb2b5939898c42
Parents: 83ba164
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Apr 27 15:55:55 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Apr 27 15:55:55 2017 +0300
----------------------------------------------------------------------
.../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 7 +++--
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 8 +++---
.../processors/database/BPlusTreeSelfTest.java | 9 +++----
.../database/FreeListImplSelfTest.java | 14 +++++-----
.../database/MemoryMetricsSelfTest.java | 5 +++-
.../database/MetadataStorageSelfTest.java | 6 +++--
.../h2/database/InlineIndexHelperTest.java | 28 +++++++-------------
7 files changed, 37 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe50d761/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
index d4e2c9f..c9ad0cf 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
@@ -21,6 +21,7 @@ import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.internal.benchmarks.jmh.JmhAbstractBenchmark;
import org.apache.ignite.internal.benchmarks.jmh.runner.JmhIdeBenchmarkRunner;
import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryProvider;
@@ -209,12 +210,14 @@ public class BPlusTreeBenchmark extends JmhAbstractBenchmark {
for (int i = 0; i < sizes.length; i++)
sizes[i] = 1024 * MB / CPUS;
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
+
PageMemory pageMem = new PageMemoryNoStoreImpl(new JavaLogger(),
new UnsafeMemoryProvider(new JavaLogger()),
null,
PAGE_SIZE,
- null,
- new MemoryMetricsImpl(null),
+ plcCfg,
+ new MemoryMetricsImpl(plcCfg),
false);
pageMem.start();
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe50d761/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 2d6839d..f0ffe65 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
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.internal.mem.DirectMemoryProvider;
import org.apache.ignite.internal.mem.file.MappedFileMemoryProvider;
import org.apache.ignite.internal.pagemem.FullPageId;
@@ -279,14 +280,11 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
protected PageMemory memory() throws Exception {
File memDir = U.resolveWorkDirectory(U.defaultWorkDirectory(), "pagemem", false);
- long[] sizes = new long[10];
-
- for (int i = 0; i < sizes.length; i++)
- sizes[i] = 1024 * 1024;
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(10 * 1024 * 1024);
DirectMemoryProvider provider = new MappedFileMemoryProvider(log(), memDir);
- return new PageMemoryNoStoreImpl(log(), provider, null, PAGE_SIZE, null, new MemoryMetricsImpl(null), true);
+ return new PageMemoryNoStoreImpl(log(), provider, null, PAGE_SIZE, plcCfg, new MemoryMetricsImpl(plcCfg), true);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe50d761/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 5f9a3c9..0254c4c 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
@@ -1699,17 +1699,14 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
* @return Page memory.
*/
protected PageMemory createPageMemory() throws Exception {
- long[] sizes = new long[CPUS];
-
- for (int i = 0; i < sizes.length; i++)
- sizes[i] = 1024 * MB / CPUS;
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
PageMemory pageMem = new PageMemoryNoStoreImpl(log,
new UnsafeMemoryProvider(log),
null,
PAGE_SIZE,
- new MemoryPolicyConfiguration().setMaxSize(5 * 1024 * MB),
- new MemoryMetricsImpl(null), true);
+ plcCfg,
+ new MemoryMetricsImpl(plcCfg), true);
pageMem.start();
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe50d761/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
index 95c3684..5f61bd6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
@@ -314,13 +314,13 @@ public class FreeListImplSelfTest extends GridCommonAbstractTest {
/**
* @return Page memory.
*/
- protected PageMemory createPageMemory(int pageSize) throws Exception {
+ protected PageMemory createPageMemory(int pageSize, MemoryPolicyConfiguration plcCfg) throws Exception {
PageMemory pageMem = new PageMemoryNoStoreImpl(log,
new UnsafeMemoryProvider(log),
null,
pageSize,
- new MemoryPolicyConfiguration().setMaxSize(1024 * MB),
- new MemoryMetricsImpl(null),
+ plcCfg,
+ new MemoryMetricsImpl(plcCfg),
true);
pageMem.start();
@@ -334,13 +334,15 @@ public class FreeListImplSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
protected FreeList createFreeList(int pageSize) throws Exception {
- pageMem = createPageMemory(pageSize);
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
+
+ pageMem = createPageMemory(pageSize, plcCfg);
long metaPageId = pageMem.allocatePage(1, 1, PageIdAllocator.FLAG_DATA);
- MemoryMetricsImpl metrics = new MemoryMetricsImpl(null);
+ MemoryMetricsImpl metrics = new MemoryMetricsImpl(plcCfg);
- MemoryPolicy memPlc = new MemoryPolicy(pageMem, null, metrics, new NoOpPageEvictionTracker());
+ MemoryPolicy memPlc = new MemoryPolicy(pageMem, plcCfg, metrics, new NoOpPageEvictionTracker());
return new FreeListImpl(1, "freelist", metrics, memPlc, null, null, metaPageId, true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe50d761/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MemoryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MemoryMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MemoryMetricsSelfTest.java
index 5347a23..cb5700f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MemoryMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MemoryMetricsSelfTest.java
@@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.database;
import java.util.concurrent.CountDownLatch;
import org.apache.ignite.MemoryMetrics;
+import org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.internal.processors.cache.database.MemoryMetricsImpl;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -41,7 +42,9 @@ public class MemoryMetricsSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- memMetrics = new MemoryMetricsImpl(null);
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration();
+
+ memMetrics = new MemoryMetricsImpl(plcCfg);
memMetrics.enableMetrics();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe50d761/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java
index 3a9f07c..af0b849 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java
@@ -157,13 +157,15 @@ public class MetadataStorageSelfTest extends GridCommonAbstractTest {
protected PageMemory memory(boolean clean) throws Exception {
DirectMemoryProvider provider = new MappedFileMemoryProvider(log(), allocationPath);
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(30 * 1024 * 1024);
+
return new PageMemoryNoStoreImpl(
log,
provider,
null,
PAGE_SIZE,
- new MemoryPolicyConfiguration().setMaxSize(30 * 1024 * 1024),
- new MemoryMetricsImpl(null),
+ plcCfg,
+ new MemoryMetricsImpl(plcCfg),
true);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe50d761/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
index ab56ca9..c101d04 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.UUID;
import junit.framework.TestCase;
import org.apache.commons.io.Charsets;
+import org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryProvider;
import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageMemory;
@@ -130,10 +131,7 @@ public class InlineIndexHelperTest extends TestCase {
/** */
public void testStringTruncate() throws Exception {
- long[] sizes = new long[CPUS];
-
- for (int i = 0; i < sizes.length; i++)
- sizes[i] = 1024 * MB / CPUS;
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
JavaLogger log = new JavaLogger();
@@ -141,8 +139,8 @@ public class InlineIndexHelperTest extends TestCase {
new UnsafeMemoryProvider(log),
null,
PAGE_SIZE,
- null,
- new MemoryMetricsImpl(null),
+ plcCfg,
+ new MemoryMetricsImpl(plcCfg),
false);
pageMem.start();
@@ -179,10 +177,7 @@ public class InlineIndexHelperTest extends TestCase {
/** */
public void testBytes() throws Exception {
- long[] sizes = new long[CPUS];
-
- for (int i = 0; i < sizes.length; i++)
- sizes[i] = 1024 * MB / CPUS;
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
JavaLogger log = new JavaLogger();
@@ -190,8 +185,8 @@ public class InlineIndexHelperTest extends TestCase {
new UnsafeMemoryProvider(log),
null,
PAGE_SIZE,
- null,
- new MemoryMetricsImpl(null),
+ plcCfg,
+ new MemoryMetricsImpl(plcCfg),
false);
pageMem.start();
@@ -297,10 +292,7 @@ public class InlineIndexHelperTest extends TestCase {
/** */
private void testPutGet(Value v1, Value v2, Value v3) throws Exception {
- long[] sizes = new long[CPUS];
-
- for (int i = 0; i < sizes.length; i++)
- sizes[i] = 1024 * MB / CPUS;
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
JavaLogger log = new JavaLogger();
@@ -308,8 +300,8 @@ public class InlineIndexHelperTest extends TestCase {
new UnsafeMemoryProvider(log),
null,
PAGE_SIZE,
- null,
- new MemoryMetricsImpl(null),
+ plcCfg,
+ new MemoryMetricsImpl(plcCfg),
false);
pageMem.start();