You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2016/03/24 16:12:01 UTC
ignite git commit: IGNITE-11048 WIP
Repository: ignite
Updated Branches:
refs/heads/ignite-11048 041f7c2b3 -> f72077f7b
IGNITE-11048 WIP
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f72077f7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f72077f7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f72077f7
Branch: refs/heads/ignite-11048
Commit: f72077f7b94eec5bf827bd9f35dfcae571c34921
Parents: 041f7c2
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Thu Mar 24 18:11:41 2016 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Thu Mar 24 18:11:41 2016 +0300
----------------------------------------------------------------------
.../CacheContinuousQueryRandomOperationsTest.java | 14 +++++++-------
...heContinuousQueryRandomOperationsTwoNodesTest.java | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f72077f7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index 509d99d..f6ad411 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -125,11 +125,11 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
- startGridsMultiThreaded(getClientIndex());
+ startGridsMultiThreaded(getServerNodeCount());
client = true;
- startGrid(getClientIndex());
+ startGrid(getServerNodeCount());
}
/** {@inheritDoc} */
@@ -843,12 +843,12 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
evtsQueues.add(evtsQueue);
- QueryCursor<?> cur = grid(rnd.nextInt(getClientIndex())).cache(ccfg.getName()).query(qry);
+ QueryCursor<?> cur = grid(rnd.nextInt(getServerNodeCount())).cache(ccfg.getName()).query(qry);
curs.add(cur);
}
else {
- for (int i = 0; i < getClientIndex(); i++) {
+ for (int i = 0; i <= getServerNodeCount(); i++) {
ContinuousQuery<Object, Object> qry = new ContinuousQuery<>();
final BlockingQueue<CacheEntryEvent<?, ?>> evtsQueue = new ArrayBlockingQueue<>(50_000);
@@ -877,7 +877,7 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
if (i % 20 == 0)
log.info("Iteration: " + i);
- for (int idx = 0; idx < getNodes(); idx++)
+ for (int idx = 0; idx < getServerNodeCount(); idx++)
randomUpdate(rnd, evtsQueues, expData, partCntr, grid(idx).cache(ccfg.getName()));
}
}
@@ -895,13 +895,13 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
* @return Client node index.
*/
private int getClientIndex() {
- return getNodes() - 1;
+ return getServerNodeCount() - 1;
}
/**
* @return Count nodes.
*/
- protected int getNodes() {
+ protected int getServerNodeCount() {
return NODES;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f72077f7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTwoNodesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTwoNodesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTwoNodesTest.java
index 2bbbb9f..ebb7861 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTwoNodesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTwoNodesTest.java
@@ -22,7 +22,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous;
*/
public class CacheContinuousQueryRandomOperationsTwoNodesTest extends CacheContinuousQueryRandomOperationsTest {
/** {@inheritDoc} */
- @Override protected int getNodes() {
- return 2;
+ @Override protected int getServerNodeCount() {
+ return 1;
}
}