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 2015/11/04 15:11:00 UTC
[17/36] ignite git commit: IGNITE-426 WIP.
IGNITE-426 WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a06995a6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a06995a6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a06995a6
Branch: refs/heads/ignite-462-2
Commit: a06995a63b6733f4d581a4b53a9240380a0c2bb1
Parents: 0a2fecb
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Thu Oct 29 11:48:11 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Nov 4 17:02:43 2015 +0300
----------------------------------------------------------------------
.../continuous/CacheContinuousQueryHandler.java | 23 ++-
.../continuous/GridContinuousProcessor.java | 22 ++-
...acheContinuousQueryFailoverAbstractTest.java | 9 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 53 ++++++
.../IgniteCacheQuerySelfTestSuite.java | 172 +++++++++----------
5 files changed, 180 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a06995a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index 8da7ed2..e40b2d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -247,6 +247,20 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
assert !skipPrimaryCheck || loc;
+ GridCacheContext<K, V> cctx = cacheContext(ctx);
+
+ if (cctx != null && initUpdIdx != null) {
+ Map<Integer, Long> map = cctx.topology().updateCounters();
+
+ for (Map.Entry<Integer, Long> e : map.entrySet()) {
+ Long cntr0 = initUpdIdx.get(e.getKey());
+ Long cntr1 = e.getValue();
+
+ if (cntr0 == null || cntr1 > cntr0)
+ initUpdIdx.put(e.getKey(), cntr1);
+ }
+ }
+
CacheContinuousQueryListener<K, V> lsnr = new CacheContinuousQueryListener<K, V>() {
@Override public void onExecution() {
if (ctx.event().isRecordable(EVT_CACHE_QUERY_EXECUTED)) {
@@ -301,7 +315,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
if (primary || skipPrimaryCheck) {
if (loc) {
if (!localCache) {
- Collection<CacheContinuousQueryEntry> entries = clientHandleEvent(ctx, entry);
+ Collection<CacheContinuousQueryEntry> entries = handleEvent(ctx, entry);
if (!entries.isEmpty()) {
final IgniteCache cache = cctx.kernalContext().cache().jcache(cctx.name());
@@ -533,7 +547,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
Collection<CacheContinuousQueryEntry> entries0 = new ArrayList<>();
for (CacheContinuousQueryEntry e : entries)
- entries0.addAll(clientHandleEvent(ctx, e));
+ entries0.addAll(handleEvent(ctx, e));
Iterable<CacheEntryEvent<? extends K, ? extends V>> evts = F.viewReadOnly(entries0,
new C1<CacheContinuousQueryEntry, CacheEntryEvent<? extends K, ? extends V>>() {
@@ -556,7 +570,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
* @param e entry.
* @return Entry collection.
*/
- private Collection<CacheContinuousQueryEntry> clientHandleEvent(GridKernalContext ctx,
+ private Collection<CacheContinuousQueryEntry> handleEvent(GridKernalContext ctx,
CacheContinuousQueryEntry e) {
assert e != null;
@@ -637,7 +651,8 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
if (initIdx != null) {
this.lastFiredEvt = initIdx;
- this.curTop = cctx.topology().topologyVersion();
+
+ curTop = cctx.topology().topologyVersion();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a06995a6/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index c63a82f..0804ffa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -53,6 +53,7 @@ import org.apache.ignite.internal.managers.discovery.CustomEventListener;
import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
import org.apache.ignite.internal.processors.GridProcessorAdapter;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
@@ -208,8 +209,27 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
if (msg.errs().isEmpty()) {
LocalRoutineInfo routine = locInfos.get(msg.routineId());
- if (routine != null)
+ if (routine != null) {
+ Map<Integer, Long> idxs = msg.updateIdxs();
+
+ GridCacheAdapter<Object, Object> interCache =
+ ctx.cache().internalCache(routine.handler().cacheName());
+
+ if (interCache != null && idxs != null && interCache.context() != null
+ && !interCache.isLocal()) {
+ Map<Integer, Long> map = interCache.context().topology().updateCounters();
+
+ for (Map.Entry<Integer, Long> e : map.entrySet()) {
+ Long cntr0 = idxs.get(e.getKey());
+ Long cntr1 = e.getValue();
+
+ if (cntr0 == null || cntr1 > cntr0)
+ idxs.put(e.getKey(), cntr1);
+ }
+ }
+
routine.handler().updateIdx(msg.updateIdxs());
+ }
fut.onRemoteRegistered();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a06995a6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
index 0a95036..049d838 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
@@ -1624,13 +1624,6 @@ public abstract class CacheContinuousQueryFailoverAbstractTest extends GridCommo
/**
* @throws Exception If failed.
*/
- public void testFailoverStartStopWithoutBackup() throws Exception {
- failoverStartStopFilter(0);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testFailoverStartStopBackup() throws Exception {
failoverStartStopFilter(2);
}
@@ -1797,7 +1790,7 @@ public abstract class CacheContinuousQueryFailoverAbstractTest extends GridCommo
if (dinQry != null) {
dinQry.close();
- log.info("Continuous query listener closed.");
+ log.info("Continuous query listener closed. Await events: " + expEvtsNewLsnr.size());
checkEvents(expEvtsNewLsnr, dinLsnr, backups == 0);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a06995a6/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 637d8a2..251cbe2 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
@@ -424,6 +424,59 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
/**
* @throws Exception If failed.
*/
+ public void testRestartQuery() throws Exception {
+ if (cacheMode() == LOCAL)
+ return;
+
+ IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+
+ final int parts = grid(0).affinity(null).partitions();
+
+ final int keyCnt = parts * 2;
+
+ for (int i = 0; i < parts / 2; i++)
+ cache.put(i, i);
+
+ for (int i = 0; i < 10; i++) {
+ if (i % 2 == 0) {
+ final AtomicInteger cntr = new AtomicInteger(0);
+
+ ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>();
+
+ qry.setLocalListener(new CacheEntryUpdatedListener<Integer, Integer>() {
+ @Override public void onUpdated(
+ Iterable<CacheEntryEvent<? extends Integer, ? extends Integer>> evts) {
+ for (CacheEntryEvent<? extends Integer, ? extends Integer> ignore : evts)
+ cntr.incrementAndGet();
+ }
+ });
+
+ QueryCursor<Cache.Entry<Integer, Integer>> query = cache.query(qry);
+
+ for (int key = 0; key < keyCnt; key++)
+ cache.put(key, key);
+
+ try {
+ assert GridTestUtils.waitForCondition(new PA() {
+ @Override public boolean apply() {
+ return cntr.get() == keyCnt;
+ }
+ }, 2000L);
+ }
+ finally {
+ query.close();
+ }
+ }
+ else {
+ for (int key = 0; key < keyCnt; key++)
+ cache.put(key, key);
+ }
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testEntriesByFilter() throws Exception {
IgniteCache<Integer, Integer> cache = grid(0).cache(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a06995a6/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index e16dffc..e54cf98 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -107,68 +107,68 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite");
// Parsing
- suite.addTestSuite(GridQueryParsingTest.class);
-
- // Queries tests.
- suite.addTestSuite(IgniteSqlSplitterSelfTest.class);
- suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryLoadSelfTest.class);
- suite.addTestSuite(IgniteCacheLocalQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheLocalAtomicQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheReplicatedQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheReplicatedQueryP2PDisabledSelfTest.class);
- suite.addTestSuite(IgniteCachePartitionedQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheAtomicQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheAtomicNearEnabledQuerySelfTest.class);
- suite.addTestSuite(IgniteCachePartitionedQueryP2PDisabledSelfTest.class);
- suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class);
- suite.addTestSuite(IgniteCacheCollocatedQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheLargeResultSelfTest.class);
- suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheOffheapEvictQueryTest.class);
- suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest2.class);
- suite.addTestSuite(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class);
- suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class);
- suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);
- suite.addTestSuite(GridCacheQuerySerializationSelfTest.class);
-
- // Scan queries.
- suite.addTestSuite(CacheScanPartitionQueryFallbackSelfTest.class);
-
- // Fields queries.
- suite.addTestSuite(SqlFieldsQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheLocalFieldsQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheReplicatedFieldsQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.class);
- suite.addTestSuite(IgniteCachePartitionedFieldsQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheAtomicFieldsQuerySelfTest.class);
- suite.addTestSuite(IgniteCacheAtomicNearEnabledFieldsQuerySelfTest.class);
- suite.addTestSuite(IgniteCachePartitionedFieldsQueryP2PEnabledSelfTest.class);
- suite.addTestSuite(IgniteCacheFieldsQueryNoDataSelfTest.class);
-
- // Continuous queries.
- suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryReplicatedSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryPartitionedSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryTxSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class);
- suite.addTestSuite(GridCacheContinuousQueryReplicatedOneNodeSelfTest.class);
+// suite.addTestSuite(GridQueryParsingTest.class);
+//
+// // Queries tests.
+// suite.addTestSuite(IgniteSqlSplitterSelfTest.class);
+// suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryLoadSelfTest.class);
+// suite.addTestSuite(IgniteCacheLocalQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheLocalAtomicQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheReplicatedQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheReplicatedQueryP2PDisabledSelfTest.class);
+// suite.addTestSuite(IgniteCachePartitionedQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheAtomicQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheAtomicNearEnabledQuerySelfTest.class);
+// suite.addTestSuite(IgniteCachePartitionedQueryP2PDisabledSelfTest.class);
+// suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class);
+// suite.addTestSuite(IgniteCacheCollocatedQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheLargeResultSelfTest.class);
+// suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
+// suite.addTestSuite(IgniteCacheOffheapEvictQueryTest.class);
+// suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class);
+// suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class);
+// suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest2.class);
+// suite.addTestSuite(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class);
+// suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class);
+// suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);
+// suite.addTestSuite(GridCacheQuerySerializationSelfTest.class);
+//
+// // Scan queries.
+// suite.addTestSuite(CacheScanPartitionQueryFallbackSelfTest.class);
+//
+// // Fields queries.
+// suite.addTestSuite(SqlFieldsQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheLocalFieldsQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheReplicatedFieldsQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.class);
+// suite.addTestSuite(IgniteCachePartitionedFieldsQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheAtomicFieldsQuerySelfTest.class);
+// suite.addTestSuite(IgniteCacheAtomicNearEnabledFieldsQuerySelfTest.class);
+// suite.addTestSuite(IgniteCachePartitionedFieldsQueryP2PEnabledSelfTest.class);
+// suite.addTestSuite(IgniteCacheFieldsQueryNoDataSelfTest.class);
+//
+// // Continuous queries.
+// suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryReplicatedSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryPartitionedSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryTxSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class);
+// suite.addTestSuite(GridCacheContinuousQueryReplicatedOneNodeSelfTest.class);
suite.addTestSuite(IgniteCacheContinuousQueryClientTest.class);
suite.addTestSuite(IgniteCacheContinuousQueryClientReconnectTest.class);
suite.addTestSuite(IgniteCacheContinuousQueryClientTxReconnectTest.class);
@@ -178,30 +178,30 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(CacheContinuousQueryFailoverTxReplicatedTest.class);
// Reduce fields queries.
- suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class);
- suite.addTestSuite(GridCacheReduceFieldsQueryPartitionedSelfTest.class);
- suite.addTestSuite(GridCacheReduceFieldsQueryAtomicSelfTest.class);
- suite.addTestSuite(GridCacheReduceFieldsQueryReplicatedSelfTest.class);
-
- suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
-
- suite.addTestSuite(GridCacheSwapScanQuerySelfTest.class);
-
- suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
-
- // Ignite cache and H2 comparison.
- suite.addTestSuite(BaseH2CompareQueryTest.class);
- suite.addTestSuite(H2CompareBigQueryTest.class);
-
- // Cache query metrics.
- suite.addTestSuite(CacheLocalQueryMetricsSelfTest.class);
- suite.addTestSuite(CachePartitionedQueryMetricsDistributedSelfTest.class);
- suite.addTestSuite(CachePartitionedQueryMetricsLocalSelfTest.class);
- suite.addTestSuite(CacheReplicatedQueryMetricsDistributedSelfTest.class);
- suite.addTestSuite(CacheReplicatedQueryMetricsLocalSelfTest.class);
-
- //Unmarshallig query test.
- suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class);
+// suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class);
+// suite.addTestSuite(GridCacheReduceFieldsQueryPartitionedSelfTest.class);
+// suite.addTestSuite(GridCacheReduceFieldsQueryAtomicSelfTest.class);
+// suite.addTestSuite(GridCacheReduceFieldsQueryReplicatedSelfTest.class);
+//
+// suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
+//
+// suite.addTestSuite(GridCacheSwapScanQuerySelfTest.class);
+//
+// suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
+//
+// // Ignite cache and H2 comparison.
+// suite.addTestSuite(BaseH2CompareQueryTest.class);
+// suite.addTestSuite(H2CompareBigQueryTest.class);
+//
+// // Cache query metrics.
+// suite.addTestSuite(CacheLocalQueryMetricsSelfTest.class);
+// suite.addTestSuite(CachePartitionedQueryMetricsDistributedSelfTest.class);
+// suite.addTestSuite(CachePartitionedQueryMetricsLocalSelfTest.class);
+// suite.addTestSuite(CacheReplicatedQueryMetricsDistributedSelfTest.class);
+// suite.addTestSuite(CacheReplicatedQueryMetricsLocalSelfTest.class);
+//
+// //Unmarshallig query test.
+// suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class);
return suite;
}