[01/32] ignite git commit: Fixed test to really check query result.

2015-09-21 Thread raulk 
Repository: ignite
Updated Branches:
  refs/heads/feature/ignite-535-mqtt 53683e20d -> 296dd6e7d


Fixed test to really check query result.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dcd8b42a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dcd8b42a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dcd8b42a

Branch: refs/heads/feature/ignite-535-mqtt
Commit: dcd8b42aa696bafbb4d7c11a9cf1520d54539001
Parents: ae1e1dc
Author: sboikov 
Authored: Tue Sep 15 16:44:05 2015 +0300
Committer: sboikov 
Committed: Tue Sep 15 16:44:05 2015 +0300

--
 ...CacheScanPartitionQueryFallbackSelfTest.java | 54 
 1 file changed, 21 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd8b42a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index df310b4..1ef470a 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -146,7 +146,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -176,7 +176,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -198,7 +198,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 try {
 Ignite ignite = startGrids(GRID_CNT);
 
-final IgniteCacheProxy cache = fillCache(ignite);
+fillCache(ignite);
 
 final AtomicBoolean done = new AtomicBoolean(false);
 
@@ -211,6 +211,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 while (!done.get()) {
 startGrid(id);
+
 Thread.sleep(3000);
 
 stopGrid(id);
@@ -240,15 +241,10 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 int part = tup.get1();
 
-try {
-CacheQuery> qry = 
cache.context().queries().createScanQuery(
-null, part, false);
+CacheQuery> qry = 
cache.context().queries().createScanQuery(
+null, part, false);
 
-doTestScanQuery(qry);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-log.warning("Invalid partition: " + part, e);
-}
+doTestScanQuery(qry, part);
 }
 
 return null;
@@ -315,17 +311,12 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 while (!done.get()) {
 int part = 
ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(null).partitions());
 
-try {
-QueryCursor> cur 
=
-cache.query(new ScanQuery(part));
+QueryCursor> cur =
+cache.query(new ScanQuery(part));
 
-U.debug(log, "Running query [node=" + nodeId + 
", part=" + part + ']');
+U.debug(log, "Running query [node=" + nodeId + ", 
part=" + part + ']');
 
-doTestScanQueryCursor(cur, part);
-

[01/14] ignite git commit: Fixed test to really check query result.

2015-09-17 Thread vozerov 
Repository: ignite
Updated Branches:
  refs/heads/master 6e48c9c4f -> c311c3c9e


Fixed test to really check query result.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dcd8b42a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dcd8b42a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dcd8b42a

Branch: refs/heads/master
Commit: dcd8b42aa696bafbb4d7c11a9cf1520d54539001
Parents: ae1e1dc
Author: sboikov 
Authored: Tue Sep 15 16:44:05 2015 +0300
Committer: sboikov 
Committed: Tue Sep 15 16:44:05 2015 +0300

--
 ...CacheScanPartitionQueryFallbackSelfTest.java | 54 
 1 file changed, 21 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd8b42a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index df310b4..1ef470a 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -146,7 +146,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -176,7 +176,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -198,7 +198,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 try {
 Ignite ignite = startGrids(GRID_CNT);
 
-final IgniteCacheProxy cache = fillCache(ignite);
+fillCache(ignite);
 
 final AtomicBoolean done = new AtomicBoolean(false);
 
@@ -211,6 +211,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 while (!done.get()) {
 startGrid(id);
+
 Thread.sleep(3000);
 
 stopGrid(id);
@@ -240,15 +241,10 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 int part = tup.get1();
 
-try {
-CacheQuery> qry = 
cache.context().queries().createScanQuery(
-null, part, false);
+CacheQuery> qry = 
cache.context().queries().createScanQuery(
+null, part, false);
 
-doTestScanQuery(qry);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-log.warning("Invalid partition: " + part, e);
-}
+doTestScanQuery(qry, part);
 }
 
 return null;
@@ -315,17 +311,12 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 while (!done.get()) {
 int part = 
ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(null).partitions());
 
-try {
-QueryCursor> cur 
=
-cache.query(new ScanQuery(part));
+QueryCursor> cur =
+cache.query(new ScanQuery(part));
 
-U.debug(log, "Running query [node=" + nodeId + 
", part=" + part + ']');
+U.debug(log, "Running query [node=" + nodeId + ", 
part=" + part + ']');
 
-doTestScanQueryCursor(cur, part);
-}
-

[01/15] ignite git commit: Fixed test to really check query result.

2015-09-17 Thread vozerov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-1282 25c9f609e -> e942cae9e


Fixed test to really check query result.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dcd8b42a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dcd8b42a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dcd8b42a

Branch: refs/heads/ignite-1282
Commit: dcd8b42aa696bafbb4d7c11a9cf1520d54539001
Parents: ae1e1dc
Author: sboikov 
Authored: Tue Sep 15 16:44:05 2015 +0300
Committer: sboikov 
Committed: Tue Sep 15 16:44:05 2015 +0300

--
 ...CacheScanPartitionQueryFallbackSelfTest.java | 54 
 1 file changed, 21 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd8b42a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index df310b4..1ef470a 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -146,7 +146,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -176,7 +176,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -198,7 +198,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 try {
 Ignite ignite = startGrids(GRID_CNT);
 
-final IgniteCacheProxy cache = fillCache(ignite);
+fillCache(ignite);
 
 final AtomicBoolean done = new AtomicBoolean(false);
 
@@ -211,6 +211,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 while (!done.get()) {
 startGrid(id);
+
 Thread.sleep(3000);
 
 stopGrid(id);
@@ -240,15 +241,10 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 int part = tup.get1();
 
-try {
-CacheQuery> qry = 
cache.context().queries().createScanQuery(
-null, part, false);
+CacheQuery> qry = 
cache.context().queries().createScanQuery(
+null, part, false);
 
-doTestScanQuery(qry);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-log.warning("Invalid partition: " + part, e);
-}
+doTestScanQuery(qry, part);
 }
 
 return null;
@@ -315,17 +311,12 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 while (!done.get()) {
 int part = 
ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(null).partitions());
 
-try {
-QueryCursor> cur 
=
-cache.query(new ScanQuery(part));
+QueryCursor> cur =
+cache.query(new ScanQuery(part));
 
-U.debug(log, "Running query [node=" + nodeId + 
", part=" + part + ']');
+U.debug(log, "Running query [node=" + nodeId + ", 
part=" + part + ']');
 
-doTestScanQueryCursor(cur, part);
-}
-

[02/18] ignite git commit: Fixed test to really check query result.

2015-09-17 Thread vozerov 
Fixed test to really check query result.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dcd8b42a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dcd8b42a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dcd8b42a

Branch: refs/heads/ignite-gg-10760
Commit: dcd8b42aa696bafbb4d7c11a9cf1520d54539001
Parents: ae1e1dc
Author: sboikov 
Authored: Tue Sep 15 16:44:05 2015 +0300
Committer: sboikov 
Committed: Tue Sep 15 16:44:05 2015 +0300

--
 ...CacheScanPartitionQueryFallbackSelfTest.java | 54 
 1 file changed, 21 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd8b42a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index df310b4..1ef470a 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -146,7 +146,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -176,7 +176,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -198,7 +198,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 try {
 Ignite ignite = startGrids(GRID_CNT);
 
-final IgniteCacheProxy cache = fillCache(ignite);
+fillCache(ignite);
 
 final AtomicBoolean done = new AtomicBoolean(false);
 
@@ -211,6 +211,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 while (!done.get()) {
 startGrid(id);
+
 Thread.sleep(3000);
 
 stopGrid(id);
@@ -240,15 +241,10 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 int part = tup.get1();
 
-try {
-CacheQuery> qry = 
cache.context().queries().createScanQuery(
-null, part, false);
+CacheQuery> qry = 
cache.context().queries().createScanQuery(
+null, part, false);
 
-doTestScanQuery(qry);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-log.warning("Invalid partition: " + part, e);
-}
+doTestScanQuery(qry, part);
 }
 
 return null;
@@ -315,17 +311,12 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 while (!done.get()) {
 int part = 
ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(null).partitions());
 
-try {
-QueryCursor> cur 
=
-cache.query(new ScanQuery(part));
+QueryCursor> cur =
+cache.query(new ScanQuery(part));
 
-U.debug(log, "Running query [node=" + nodeId + 
", part=" + part + ']');
+U.debug(log, "Running query [node=" + nodeId + ", 
part=" + part + ']');
 
-doTestScanQueryCursor(cur, part);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-

[36/50] [abbrv] ignite git commit: Fixed test to really check query result.

2015-09-17 Thread akuznetsov 
Fixed test to really check query result.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dcd8b42a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dcd8b42a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dcd8b42a

Branch: refs/heads/ignite-843
Commit: dcd8b42aa696bafbb4d7c11a9cf1520d54539001
Parents: ae1e1dc
Author: sboikov 
Authored: Tue Sep 15 16:44:05 2015 +0300
Committer: sboikov 
Committed: Tue Sep 15 16:44:05 2015 +0300

--
 ...CacheScanPartitionQueryFallbackSelfTest.java | 54 
 1 file changed, 21 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd8b42a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index df310b4..1ef470a 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -146,7 +146,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -176,7 +176,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -198,7 +198,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 try {
 Ignite ignite = startGrids(GRID_CNT);
 
-final IgniteCacheProxy cache = fillCache(ignite);
+fillCache(ignite);
 
 final AtomicBoolean done = new AtomicBoolean(false);
 
@@ -211,6 +211,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 while (!done.get()) {
 startGrid(id);
+
 Thread.sleep(3000);
 
 stopGrid(id);
@@ -240,15 +241,10 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 int part = tup.get1();
 
-try {
-CacheQuery> qry = 
cache.context().queries().createScanQuery(
-null, part, false);
+CacheQuery> qry = 
cache.context().queries().createScanQuery(
+null, part, false);
 
-doTestScanQuery(qry);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-log.warning("Invalid partition: " + part, e);
-}
+doTestScanQuery(qry, part);
 }
 
 return null;
@@ -315,17 +311,12 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 while (!done.get()) {
 int part = 
ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(null).partitions());
 
-try {
-QueryCursor> cur 
=
-cache.query(new ScanQuery(part));
+QueryCursor> cur =
+cache.query(new ScanQuery(part));
 
-U.debug(log, "Running query [node=" + nodeId + 
", part=" + part + ']');
+U.debug(log, "Running query [node=" + nodeId + ", 
part=" + part + ']');
 
-doTestScanQueryCursor(cur, part);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-

[42/55] [abbrv] ignite git commit: Fixed test to really check query result.

2015-09-16 Thread agoncharuk 
Fixed test to really check query result.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dcd8b42a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dcd8b42a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dcd8b42a

Branch: refs/heads/ignite-1171
Commit: dcd8b42aa696bafbb4d7c11a9cf1520d54539001
Parents: ae1e1dc
Author: sboikov 
Authored: Tue Sep 15 16:44:05 2015 +0300
Committer: sboikov 
Committed: Tue Sep 15 16:44:05 2015 +0300

--
 ...CacheScanPartitionQueryFallbackSelfTest.java | 54 
 1 file changed, 21 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dcd8b42a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index df310b4..1ef470a 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -146,7 +146,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -176,7 +176,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 CacheQuery> qry = 
cache.context().queries().createScanQuery(null, part, false);
 
-doTestScanQuery(qry);
+doTestScanQuery(qry, part);
 }
 finally {
 stopAllGrids();
@@ -198,7 +198,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 try {
 Ignite ignite = startGrids(GRID_CNT);
 
-final IgniteCacheProxy cache = fillCache(ignite);
+fillCache(ignite);
 
 final AtomicBoolean done = new AtomicBoolean(false);
 
@@ -211,6 +211,7 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 while (!done.get()) {
 startGrid(id);
+
 Thread.sleep(3000);
 
 stopGrid(id);
@@ -240,15 +241,10 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 
 int part = tup.get1();
 
-try {
-CacheQuery> qry = 
cache.context().queries().createScanQuery(
-null, part, false);
+CacheQuery> qry = 
cache.context().queries().createScanQuery(
+null, part, false);
 
-doTestScanQuery(qry);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-log.warning("Invalid partition: " + part, e);
-}
+doTestScanQuery(qry, part);
 }
 
 return null;
@@ -315,17 +311,12 @@ public class CacheScanPartitionQueryFallbackSelfTest 
extends GridCommonAbstractT
 while (!done.get()) {
 int part = 
ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(null).partitions());
 
-try {
-QueryCursor> cur 
=
-cache.query(new ScanQuery(part));
+QueryCursor> cur =
+cache.query(new ScanQuery(part));
 
-U.debug(log, "Running query [node=" + nodeId + 
", part=" + part + ']');
+U.debug(log, "Running query [node=" + nodeId + ", 
part=" + part + ']');
 
-doTestScanQueryCursor(cur, part);
-}
-catch (ClusterGroupEmptyCheckedException e) {
-