You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/03/03 22:38:22 UTC
[02/50] incubator-ignite git commit: # ignite-237
# ignite-237
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e50d1ead
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e50d1ead
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e50d1ead
Branch: refs/heads/ignite-sql-tests
Commit: e50d1eadc11651c9029b81ccd0636ea003f5b1a7
Parents: bcf802d
Author: sboikov <sb...@gridgain.com>
Authored: Fri Feb 27 17:12:25 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Feb 27 17:12:25 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/GridCacheAffinityBackupsSelfTest.java | 8 --------
.../GridCacheContinuousQueryAbstractSelfTest.java | 12 ++++++------
2 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50d1ead/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
index 88a3cc1..0758993 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
@@ -58,14 +58,6 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testConsistentHashBackups() throws Exception {
- for (int i = 0; i < nodesCnt; i++)
- checkBackups(i, new CacheRendezvousAffinityFunction());
- }
-
- /**
- * @throws Exception If failed.
- */
public void testRendezvousBackups() throws Exception {
for (int i = 0; i < nodesCnt; i++)
checkBackups(i, new CacheRendezvousAffinityFunction());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50d1ead/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 0d9e189..d2b1786 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -165,12 +165,14 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
Set<Cache.Entry<Object, Object>> entries = ((IgniteKernal) grid(i)).cache(null).entrySet();
for (Cache.Entry entry : entries) {
- info("Not removed entry " + grid(i).affinity(null).isPrimary(grid(i).localNode(), entry.getKey()));
- info("Not removed entry " + grid(i).affinity(null).isBackup(grid(i).localNode(), entry.getKey()));
+ boolean primary = grid(i).affinity(null).isPrimary(grid(i).localNode(), entry.getKey());
+
+ boolean backup = grid(i).affinity(null).isBackup(grid(i).localNode(), entry.getKey());
+
+ info("Not removed entry [grid=" + i + ", primary=" + primary + ", backup=" + backup + ']');
+
allEmpty = false;
}
-
- info("Cache is not empty: " + ((IgniteKernal) grid(i)).cache(null).entrySet());
}
assertTrue(allEmpty);
@@ -844,8 +846,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
finally {
stopGrid("anotherGrid");
}
-
- awaitPartitionMapExchange();
}
/**