You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/17 08:49:21 UTC
[07/13] ignite git commit: ignite-gg-8.0.2.ea2 mute tests,
link to task
ignite-gg-8.0.2.ea2 mute tests, link to task
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9bb1d90
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9bb1d90
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9bb1d90
Branch: refs/heads/ignite-gg-11810
Commit: e9bb1d900f6e65d8371cb32cbb09e79f9ccc8992
Parents: 166d637
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Jan 16 18:27:51 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Mon Jan 16 18:27:51 2017 +0300
----------------------------------------------------------------------
.../cache/GridCacheAbstractMetricsSelfTest.java | 8 +++++++-
.../GridCacheReplicatedUnswapAdvancedSelfTest.java | 3 +++
.../local/LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 ++++++++++
.../internal/processors/query/h2/IgniteH2Indexing.java | 2 +-
.../processors/query/h2/database/H2TreeIndex.java | 2 +-
5 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index 5ad7e5c..aca01a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -615,6 +615,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testMisses() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
IgniteCache<Integer, Integer> cache = grid(0).cache(null);
int keyCnt = keyCount();
@@ -657,12 +659,14 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testMissesOnEmptyCache() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
IgniteCache<Integer, Integer> cache = grid(0).cache(null);
assertEquals("Expected 0 read", 0, cache.localMetrics().getCacheGets());
assertEquals("Expected 0 miss", 0, cache.localMetrics().getCacheMisses());
- Integer key = null;
+ Integer key = null;
for (int i = 0; i < 1000; i++) {
if (affinity(cache).isPrimary(grid(0).localNode(), i)) {
@@ -709,6 +713,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testManualEvictions() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
IgniteCache<Integer, Integer> cache = grid(0).cache(null);
if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == CacheMode.PARTITIONED)
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
index a1a92d4..006cb87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
@@ -69,6 +69,9 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testUnswapAdvanced() throws Exception {
+ //TODO GG-11141
+ fail();
+
Ignite g1 = startGrid(1);
Ignite g2 = startGrid(2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java
index 20befb5..beec47e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java
@@ -103,6 +103,8 @@ public class LocalCacheOffHeapAndSwapMetricsSelfTest extends GridCommonAbstractT
* @throws Exception if failed.
*/
public void testOffHeapMetrics() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
createCache(CacheMemoryMode.ONHEAP_TIERED, 0, false);
for (int i = 0; i < KEYS_CNT; i++)
@@ -184,6 +186,8 @@ public class LocalCacheOffHeapAndSwapMetricsSelfTest extends GridCommonAbstractT
* @throws Exception if failed.
*/
public void testSwapMetrics() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
createCache(CacheMemoryMode.ONHEAP_TIERED, -1, true);
for (int i = 0; i < KEYS_CNT; i++)
@@ -253,6 +257,8 @@ public class LocalCacheOffHeapAndSwapMetricsSelfTest extends GridCommonAbstractT
* @throws Exception if failed.
*/
public void testOffHeapAndSwapMetrics() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
createCache(CacheMemoryMode.ONHEAP_TIERED, OFFHEAP_MAX_SIZE, true);
for (int i = 0; i < KEYS_CNT; i++)
@@ -376,6 +382,8 @@ public class LocalCacheOffHeapAndSwapMetricsSelfTest extends GridCommonAbstractT
* @throws Exception if failed.
*/
public void testOffHeapMetricsInOffHeapTiered() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
createCache(CacheMemoryMode.OFFHEAP_TIERED, 0, false);
for (int i = 0; i < KEYS_CNT; i++)
@@ -457,6 +465,8 @@ public class LocalCacheOffHeapAndSwapMetricsSelfTest extends GridCommonAbstractT
* @throws Exception if failed.
*/
public void testOffHeapAndSwapMetricsInOffHeapTiered() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
createCache(CacheMemoryMode.OFFHEAP_TIERED, OFFHEAP_MAX_SIZE, true);
for (int i = 0; i < KEYS_CNT; i++)
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 6ea3387..98b5b7f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -2008,7 +2008,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
// unregisterMBean(); TODO https://issues.apache.org/jira/browse/IGNITE-2139
- if (!ctx.cache().context().database().persistenceEnabled()) {
+ if (ctx != null && !ctx.cache().context().database().persistenceEnabled()) {
for (Schema schema : schemas.values())
schema.onDrop();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index 3268d9d..19cbbf9 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -79,7 +79,7 @@ public class H2TreeIndex extends GridH2IndexBase {
name = BPlusTree.treeName(name, "H2Tree");
- if (!cctx.kernalContext().clientNode() && cctx.affinityNode()) {
+ if (cctx.affinityNode()) {
IgniteCacheDatabaseSharedManager dbMgr = cctx.shared().database();
RootPage page = cctx.offheap().rootPageForIndex(name);