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 2015/06/23 10:13:41 UTC
incubator-ignite git commit: # ignite-1022 fixed test
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1022 74dc6d5a2 -> 627d0b5d4
# ignite-1022 fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/627d0b5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/627d0b5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/627d0b5d
Branch: refs/heads/ignite-1022
Commit: 627d0b5d43e78b58ac979a8cadb48ae00f7f0646
Parents: 74dc6d5
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jun 23 11:13:20 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jun 23 11:13:20 2015 +0300
----------------------------------------------------------------------
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 --
...achePartitionedMultiNodeFullApiSelfTest.java | 49 +++++++++++++++-----
2 files changed, 38 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/627d0b5d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 8343c64..d40e9e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -192,11 +192,6 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
// Not needed for near-only cache.
}
- /** {@inheritDoc} */
- @Override public void testNearDhtKeySize() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-1029");
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/627d0b5d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index 84594a2..9445f9c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -299,26 +299,53 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
info("Generating keys for test...");
- IgniteCache<String, Integer> cache0 = jcache(0);
+ IgniteEx ignite0 = null;
+ IgniteEx ignite1 = null;
+ IgniteEx ignite2 = null;
- for (int i = 0; i < 5; i++) {
- while (true) {
- String key = UUID.randomUUID().toString();
-
- if (ignite(0).affinity(null).isPrimary(grid(0).localNode(), key) &&
- ignite(0).affinity(null).isBackup(grid(1).localNode(), key)) {
- keys.add(key);
+ for (int i = 0; i < gridCount(); i++) {
+ IgniteEx ignite = grid(i);
- cache0.put(key, i);
+ if (!ignite.configuration().isClientMode()) {
+ if (ignite0 == null)
+ ignite0 = ignite;
+ else if (ignite1 == null)
+ ignite1 = ignite;
+ else {
+ ignite2 = ignite;
break;
}
+
}
}
+ assertNotNull(ignite0);
+ assertNotNull(ignite1);
+ assertNotNull(ignite2);
+
+ info("Generating keys for test [nodes=" + ignite0.name() + ", " + ignite1.name() + ", " + ignite2.name() + ']');
+
+ IgniteCache<String, Integer> cache0 = ignite0.cache(null);
+
+ int val = 0;
+
+ for (int i = 0; i < 10_000 && keys.size() < 5; i++) {
+ String key = String.valueOf(i);
+
+ if (ignite(0).affinity(null).isPrimary(ignite0.localNode(), key) &&
+ ignite(0).affinity(null).isBackup(ignite1.localNode(), key)) {
+ keys.add(key);
+
+ cache0.put(key, val++);
+ }
+ }
+
+ assertEquals(5, keys.size());
+
info("Finished generating keys for test.");
- IgniteCache<String, Integer> cache2 = jcache(2);
+ IgniteCache<String, Integer> cache2 = ignite2.cache(null);
assertEquals(Integer.valueOf(0), cache2.get(keys.get(0)));
assertEquals(Integer.valueOf(1), cache2.get(keys.get(1)));
@@ -326,7 +353,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
assertEquals(0, cache0.localSize(NEAR));
assertEquals(5, cache0.localSize(CachePeekMode.ALL) - cache0.localSize(NEAR));
- IgniteCache<String, Integer> cache1 = jcache(1);
+ IgniteCache<String, Integer> cache1 = ignite1.cache(null);
assertEquals(0, cache1.localSize(NEAR));
assertEquals(5, cache1.localSize(CachePeekMode.ALL) - cache1.localSize(NEAR));