http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df488d08/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
deleted file mode 100644
index 096bb2e..0000000
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ /dev/null
@@ -1,859 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.eviction.lru.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.processors.query.h2.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- * Multi-threaded tests for cache queries.
- */
-@SuppressWarnings("StatementWithEmptyBody")
-public class GridCacheQueryMultiThreadedSelfTest extends 
GridCommonAbstractTest {
-    /** */
-    private static final boolean TEST_INFO = true;
-
-    /** Number of test grids (nodes). Should not be less than 2. */
-    private static final int GRID_CNT = 2;
-
-    /** */
-    private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
-
-    /** */
-    private static AtomicInteger idxSwapCnt = new AtomicInteger();
-
-    /** */
-    private static AtomicInteger idxUnswapCnt = new AtomicInteger();
-
-    /** */
-    private static final long DURATION = 30 * 1000;
-
-    /** Don't start grid by default. */
-    public GridCacheQueryMultiThreadedSelfTest() {
-        super(false);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-        disco.setIpFinder(ipFinder);
-
-        cfg.setDiscoverySpi(disco);
-
-        cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
-        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
-
-        CacheConfiguration cacheCfg = defaultCacheConfiguration();
-
-        cacheCfg.setCacheMode(PARTITIONED);
-        cacheCfg.setAtomicityMode(TRANSACTIONAL);
-        cacheCfg.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED);
-        
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cacheCfg.setSwapEnabled(true);
-        cacheCfg.setBackups(1);
-        cacheCfg.setEvictionPolicy(evictsEnabled() ? new 
CacheLruEvictionPolicy(100) : null);
-
-        CacheQueryConfiguration qcfg = new CacheQueryConfiguration();
-
-        qcfg.setIndexPrimitiveKey(true);
-
-        cacheCfg.setQueryConfiguration(qcfg);
-
-        if (offheapEnabled() && evictsEnabled())
-            cacheCfg.setOffHeapMaxMemory(1000); // Small offheap for evictions.
-
-        cfg.setCacheConfiguration(cacheCfg);
-
-        GridQueryConfiguration indexing = new GridQueryConfiguration();
-
-        indexing.setMaxOffheapRowsCacheSize(128);
-
-        if (offheapEnabled())
-            indexing.setMaxOffHeapMemory(0);
-
-        cfg.setQueryConfiguration(indexing);
-
-        GridQueryProcessor.idxCls = FakeIndexing.class;
-
-        return cfg;
-    }
-
-    /**
-     *
-     */
-    private static class FakeIndexing extends IgniteH2Indexing {
-        @Override public void onSwap(@Nullable String spaceName, Object key) 
throws IgniteCheckedException {
-            super.onSwap(spaceName, key);
-
-            idxSwapCnt.incrementAndGet();
-        }
-
-        @Override public void onUnswap(@Nullable String spaceName, Object key, 
Object val, byte[] valBytes)
-        throws IgniteCheckedException {
-            super.onUnswap(spaceName, key, val, valBytes);
-
-            idxUnswapCnt.incrementAndGet();
-        }
-    }
-
-    /** @return {@code true} If offheap enabled. */
-    protected boolean offheapEnabled() {
-        return false;
-    }
-
-    /** @return {@code true} If evictions enabled. */
-    protected boolean evictsEnabled() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        super.beforeTest();
-
-        // Clean up all caches.
-        for (int i = 0; i < GRID_CNT; i++) {
-            GridCache<Object, Object> c = grid(i).cache(null);
-
-            assertEquals(0, c.size());
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        assert GRID_CNT >= 2 : "Constant GRID_CNT must be greater than or 
equal to 2.";
-
-        startGridsMultiThreaded(GRID_CNT);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-
-        if (evictsEnabled()) {
-            assertTrue(idxSwapCnt.get() > 0);
-            assertTrue(idxUnswapCnt.get() > 0);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTest() throws Exception {
-        super.afterTest();
-
-        // Clean up all caches.
-        for (int i = 0; i < GRID_CNT; i++) {
-            GridCache<Object, Object> c = grid(i).cache(null);
-
-            c.removeAll(F.<CacheEntry<Object, Object>>alwaysTrue());
-
-            Iterator<Map.Entry<Object, Object>> it = c.swapIterator();
-
-            while (it.hasNext()) {
-                it.next();
-
-                it.remove();
-            }
-
-            it = c.offHeapIterator();
-
-            while (it.hasNext()) {
-                it.next();
-
-                it.remove();
-            }
-
-            assertEquals("Swap keys: " + c.swapKeys(), 0, c.swapKeys());
-            assertEquals(0, c.offHeapEntriesCount());
-            assertEquals(0, c.size());
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void info(String msg) {
-        if (TEST_INFO)
-            super.info(msg);
-    }
-
-    /**
-     * @param entries Entries.
-     * @param g Grid.
-     * @return Affinity nodes.
-     */
-    private Set<UUID> affinityNodes(Iterable<Map.Entry<Integer, Integer>> 
entries, Ignite g) {
-        Set<UUID> nodes = new HashSet<>();
-
-        for (Map.Entry<Integer, Integer> entry : entries)
-            
nodes.add(g.cache(null).affinity().mapKeyToPrimaryAndBackups(entry.getKey()).iterator().next().id());
-
-        return nodes;
-    }
-
-    /**
-     * JUnit.
-     *
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public void testMultiThreadedSwapUnswapString() throws Exception {
-        int threadCnt = 150;
-        final int keyCnt = 2000;
-        final int valCnt = 10000;
-
-        final Ignite g = grid(0);
-
-        // Put test values into cache.
-        final GridCache<Integer, String> c = g.cache(null);
-
-        assertEquals(0, g.cache(null).size());
-        assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 
1").execute().get().size());
-        assertEquals(0, c.queries().createSqlQuery(Long.class, "1 = 
1").execute().get().size());
-
-        Random rnd = new Random();
-
-        for (int i = 0; i < keyCnt; i += 1 + rnd.nextInt(3)) {
-            c.putx(i, String.valueOf(rnd.nextInt(valCnt)));
-
-            if (evictsEnabled() && rnd.nextBoolean())
-                assertTrue(c.evict(i));
-        }
-
-        final AtomicBoolean done = new AtomicBoolean();
-
-        IgniteFuture<?> fut = multithreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
-                Random rnd = new Random();
-
-                while (!done.get()) {
-                    switch (rnd.nextInt(5)) {
-                        case 0:
-                            c.putx(rnd.nextInt(keyCnt), 
String.valueOf(rnd.nextInt(valCnt)));
-
-                            break;
-                        case 1:
-                            if (evictsEnabled())
-                                c.evict(rnd.nextInt(keyCnt));
-
-                            break;
-                        case 2:
-                            c.remove(rnd.nextInt(keyCnt));
-
-                            break;
-                        case 3:
-                            c.get(rnd.nextInt(keyCnt));
-
-                            break;
-                        case 4:
-                            CacheQuery<Map.Entry<Integer, String>> qry = 
c.queries().createSqlQuery(
-                                String.class, "_val between ? and ?");
-
-                            int from = rnd.nextInt(valCnt);
-
-                            CacheQueryFuture<Map.Entry<Integer, String>> fut =
-                                qry.execute(String.valueOf(from), 
String.valueOf(from + 250));
-
-                            Collection<Map.Entry<Integer, String>> res = 
fut.get();
-
-                            for (Map.Entry<Integer, String> ignored : res) {
-                                //No-op.
-                            }
-                    }
-                }
-            }
-        }, threadCnt);
-
-        Thread.sleep(DURATION);
-
-        done.set(true);
-
-        fut.get();
-    }
-
-    /**
-     * JUnit.
-     *
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public void testMultiThreadedSwapUnswapLong() throws Exception {
-        int threadCnt = 150;
-        final int keyCnt = 2000;
-        final int valCnt = 10000;
-
-        final Ignite g = grid(0);
-
-        // Put test values into cache.
-        final GridCache<Integer, Long> c = g.cache(null);
-
-        assertEquals(0, g.cache(null).size());
-        assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 
1").execute().get().size());
-        assertEquals(0, c.queries().createSqlQuery(Long.class, "1 = 
1").execute().get().size());
-
-        Random rnd = new Random();
-
-        for (int i = 0; i < keyCnt; i += 1 + rnd.nextInt(3)) {
-            c.putx(i, (long)rnd.nextInt(valCnt));
-
-            if (evictsEnabled() && rnd.nextBoolean())
-                assertTrue(c.evict(i));
-        }
-
-        final AtomicBoolean done = new AtomicBoolean();
-
-        IgniteFuture<?> fut = multithreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
-                Random rnd = new Random();
-
-                while (!done.get()) {
-                    int key = rnd.nextInt(keyCnt);
-
-                    switch (rnd.nextInt(5)) {
-                        case 0:
-                            c.putx(key, (long)rnd.nextInt(valCnt));
-
-                            break;
-                        case 1:
-                            if (evictsEnabled())
-                                c.evict(key);
-
-                            break;
-                        case 2:
-                            c.remove(key);
-
-                            break;
-                        case 3:
-                            c.get(key);
-
-                            break;
-                        case 4:
-                            CacheQuery<Map.Entry<Integer, Long>> qry = 
c.queries().createSqlQuery(
-                                Long.class,
-                                "_val between ? and ?");
-
-                            int from = rnd.nextInt(valCnt);
-
-                            CacheQueryFuture<Map.Entry<Integer, Long>> f = 
qry.execute(from, from + 250);
-
-                            Collection<Map.Entry<Integer, Long>> res = f.get();
-
-                            for (Map.Entry<Integer, Long> ignored : res) {
-                                //No-op.
-                            }
-                    }
-                }
-            }
-        }, threadCnt);
-
-        Thread.sleep(DURATION);
-
-        done.set(true);
-
-        fut.get();
-    }
-
-    /**
-     * JUnit.
-     *
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public void testMultiThreadedSwapUnswapLongString() throws Exception {
-        int threadCnt = 150;
-        final int keyCnt = 2000;
-        final int valCnt = 10000;
-
-        final Ignite g = grid(0);
-
-        // Put test values into cache.
-        final GridCache<Integer, Object> c = g.cache(null);
-
-        assertEquals(0, g.cache(null).size());
-        assertEquals(0, c.offHeapEntriesCount());
-//        assertEquals(0, c.swapKeys());
-        assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 
1").execute().get().size());
-        assertEquals(0, c.queries().createSqlQuery(Long.class, "1 = 
1").execute().get().size());
-
-        Random rnd = new Random();
-
-        for (int i = 0; i < keyCnt; i += 1 + rnd.nextInt(3)) {
-            c.putx(i, rnd.nextBoolean() ? (long)rnd.nextInt(valCnt) : 
String.valueOf(rnd.nextInt(valCnt)));
-
-            if (evictsEnabled() && rnd.nextBoolean())
-                assertTrue(c.evict(i));
-        }
-
-        final AtomicBoolean done = new AtomicBoolean();
-
-        IgniteFuture<?> fut = multithreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
-                Random rnd = new Random();
-
-                while (!done.get()) {
-                    int key = rnd.nextInt(keyCnt);
-
-                    switch (rnd.nextInt(5)) {
-                        case 0:
-                            c.putx(key, rnd.nextBoolean() ? 
(long)rnd.nextInt(valCnt) :
-                                String.valueOf(rnd.nextInt(valCnt)));
-
-                            break;
-                        case 1:
-                            if (evictsEnabled())
-                                c.evict(key);
-
-                            break;
-                        case 2:
-                            c.remove(key);
-
-                            break;
-                        case 3:
-                            c.get(key);
-
-                            break;
-                        case 4:
-                            CacheQuery<Map.Entry<Integer, Object>> qry = 
c.queries().createSqlQuery(
-                                rnd.nextBoolean() ? Long.class : String.class,
-                                "_val between ? and ?");
-
-                            int from = rnd.nextInt(valCnt);
-
-                            CacheQueryFuture<Map.Entry<Integer, Object>> f = 
qry.execute(from, from + 250);
-
-                            Collection<Map.Entry<Integer, Object>> res = 
f.get();
-
-                            for (Map.Entry<Integer, Object> ignored : res) {
-                                //No-op.
-                            }
-                    }
-                }
-            }
-        }, threadCnt);
-
-        Thread.sleep(DURATION);
-
-        done.set(true);
-
-        fut.get();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public void testMultiThreadedSwapUnswapObject() throws Exception {
-        int threadCnt = 50;
-        final int keyCnt = 4000;
-        final int valCnt = 10000;
-
-        final Ignite g = grid(0);
-
-        // Put test values into cache.
-        final GridCache<Integer, TestValue> c = g.cache(null);
-
-        assertEquals(0, g.cache(null).size());
-        assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 
1").execute().get().size());
-        assertEquals(0, c.queries().createSqlQuery(Long.class, "1 = 
1").execute().get().size());
-
-        Random rnd = new Random();
-
-        for (int i = 0; i < keyCnt; i += 1 + rnd.nextInt(3)) {
-            c.putx(i, new TestValue(rnd.nextInt(valCnt)));
-
-            if (evictsEnabled() && rnd.nextBoolean())
-                assertTrue(c.evict(i));
-        }
-
-        final AtomicBoolean done = new AtomicBoolean();
-
-        IgniteFuture<?> fut = multithreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
-                Random rnd = new Random();
-
-                while (!done.get()) {
-                    int key = rnd.nextInt(keyCnt);
-
-                    switch (rnd.nextInt(5)) {
-                        case 0:
-                            c.putx(key, new TestValue(rnd.nextInt(valCnt)));
-
-                            break;
-                        case 1:
-                            if (evictsEnabled())
-                                c.evict(key);
-
-                            break;
-                        case 2:
-                            c.remove(key);
-
-                            break;
-                        case 3:
-                            c.get(key);
-
-                            break;
-                        case 4:
-                            CacheQuery<Map.Entry<Integer, TestValue>> qry = 
c.queries().createSqlQuery(
-                                Long.class, "TestValue.val between ? and ?");
-
-                            int from = rnd.nextInt(valCnt);
-
-                            CacheQueryFuture<Map.Entry<Integer, TestValue>> f 
= qry.execute(from, from + 250);
-
-                            Collection<Map.Entry<Integer, TestValue>> res = 
f.get();
-
-                            for (Map.Entry<Integer, TestValue> ignored : res) {
-                                //No-op.
-                            }
-                    }
-                }
-            }
-        }, threadCnt);
-
-        Thread.sleep(DURATION);
-
-        done.set(true);
-
-        fut.get();
-    }
-
-    /**
-     * JUnit.
-     *
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public void testMultiThreadedSameQuery() throws Exception {
-        int threadCnt = 50;
-        final int keyCnt = 10;
-        final int logMod = 5000;
-
-        final Ignite g = grid(0);
-
-        // Put test values into cache.
-        GridCache<Integer, Integer> c = g.cache(null);
-
-        for (int i = 0; i < keyCnt; i++) {
-            c.putx(i, i);
-
-            info("Affinity [key=" + i + ", aff=" + 
c.affinity().mapKeyToPrimaryAndBackups(i).iterator().next().id() + ']');
-
-            assertTrue(c.evict(i));
-        }
-
-        final AtomicInteger cnt = new AtomicInteger();
-
-        final AtomicBoolean done = new AtomicBoolean();
-
-        final CacheQuery<Map.Entry<Integer, Integer>> qry = 
c.queries().createSqlQuery(Integer.class, "_val >= 0");
-
-        IgniteFuture<?> fut = multithreadedAsync(
-            new CAX() {
-                @Override public void applyx() throws IgniteCheckedException {
-                    int iter = 0;
-
-                    while (!done.get() && 
!Thread.currentThread().isInterrupted()) {
-                        iter++;
-
-                        CacheQueryFuture<Map.Entry<Integer, Integer>> fut = 
qry.execute();
-
-                        Collection<Map.Entry<Integer, Integer>> entries = 
fut.get();
-
-                        assert entries != null;
-
-                        assertEquals("Query results [entries=" + entries + ", 
aff=" + affinityNodes(entries, g) +
-                            ", iteration=" + iter + ']', keyCnt, 
entries.size());
-
-                        if (cnt.incrementAndGet() % logMod == 0) {
-                            GridCacheQueryManager<Object, Object> qryMgr =
-                                
((GridKernal)g).internalCache().context().queries();
-
-                            assert qryMgr != null;
-
-                            qryMgr.printMemoryStats();
-                        }
-                    }
-                }
-            }, threadCnt);
-
-        Thread.sleep(DURATION);
-
-        info("Finishing test...");
-
-        done.set(true);
-
-        fut.get();
-    }
-
-    /**
-     * JUnit.
-     *
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public void testMultiThreadedNewQueries() throws Exception {
-        int threadCnt = 50;
-        final int keyCnt = 10;
-        final int logMod = 5000;
-
-        final Ignite g = grid(0);
-
-        // Put test values into cache.
-        final GridCache<Integer, Integer> c = g.cache(null);
-
-        for (int i = 0; i < keyCnt; i++) {
-            c.putx(i, i);
-
-            assertTrue(c.evict(i));
-        }
-
-        final AtomicInteger cnt = new AtomicInteger();
-
-        final AtomicBoolean done = new AtomicBoolean();
-
-        IgniteFuture<?> fut = multithreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
-                int iter = 0;
-
-                while (!done.get() && !Thread.currentThread().isInterrupted()) 
{
-                    iter++;
-
-                    CacheQuery<Map.Entry<Integer, Integer>> qry =
-                        c.queries().createSqlQuery(Integer.class, "_val >= 0");
-
-                    CacheQueryFuture<Map.Entry<Integer, Integer>> fut = 
qry.execute();
-
-                    Collection<Map.Entry<Integer, Integer>> entries = 
fut.get();
-
-                    assert entries != null;
-
-                    assertEquals("Entries count is not as expected on 
iteration: " + iter, keyCnt, entries.size());
-
-                    if (cnt.incrementAndGet() % logMod == 0) {
-                        GridCacheQueryManager<Object, Object> qryMgr =
-                            
((GridKernal)g).internalCache().context().queries();
-
-                        assert qryMgr != null;
-
-                        qryMgr.printMemoryStats();
-                    }
-                }
-            }
-        }, threadCnt);
-
-        Thread.sleep(DURATION);
-
-        done.set(true);
-
-        fut.get();
-    }
-
-    /**
-     * JUnit.
-     *
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public void testMultiThreadedReduceQuery() throws Exception {
-        int threadCnt = 50;
-        int keyCnt = 10;
-        final int logMod = 5000;
-
-        final Ignite g = grid(0);
-
-        // Put test values into cache.
-        GridCache<Integer, Integer> c = g.cache(null);
-
-        for (int i = 0; i < keyCnt; i++)
-            c.putx(i, i);
-
-        final CacheQuery<Map.Entry<Integer, Integer>> rdcQry =
-            c.queries().createSqlQuery(Integer.class, "_val > 1 and _val < 4");
-
-        rdcQry.includeBackups(true);
-        rdcQry.keepAll(true);
-
-        final IgniteReducer<Map.Entry<Integer, Integer>, Integer> rmtRdc =
-            new IgniteReducer<Map.Entry<Integer, Integer>, Integer>() {
-                /** Reducer result. */
-                private int res;
-
-                @Override public boolean collect(Map.Entry<Integer, Integer> 
e) {
-                    res += e.getKey();
-
-                    return true;
-                }
-
-                @Override public Integer reduce() {
-                    return res;
-                }
-            };
-
-        final AtomicInteger cnt = new AtomicInteger();
-
-        final AtomicBoolean stop = new AtomicBoolean();
-
-        IgniteFuture<?> fut = multithreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
-                while (!stop.get()) {
-                    Collection<Integer> rmtVals = rdcQry.execute(rmtRdc).get();
-
-                    assertEquals(GRID_CNT, rmtVals.size());
-
-                    Iterator<Integer> reduceIter = rmtVals.iterator();
-
-                    assert reduceIter != null;
-
-                    for (int i = 0; i < GRID_CNT; i++) {
-                        assert reduceIter.hasNext();
-
-                        assertEquals(Integer.valueOf(5), reduceIter.next());
-                    }
-
-                    Collection<Integer> res = rdcQry.execute(rmtRdc).get();
-
-                    int val = F.sumInt(res);
-
-                    int expVal = 5 * GRID_CNT;
-
-                    assertEquals(expVal, val);
-
-                    if (cnt.incrementAndGet() % logMod == 0) {
-                        GridCacheQueryManager<Object, Object> qryMgr =
-                            
((GridKernal)g).internalCache().context().queries();
-
-                        assert qryMgr != null;
-
-                        qryMgr.printMemoryStats();
-                    }
-                }
-            }
-        }, threadCnt);
-
-        Thread.sleep(DURATION);
-
-        stop.set(true);
-
-        fut.get();
-    }
-
-    /**
-     * JUnit.
-     *
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public void testMultiThreadedScanQuery() throws Exception {
-        int threadCnt = 50;
-        final int keyCnt = 500;
-        final int logMod = 5000;
-
-        final Ignite g = grid(0);
-
-        // Put test values into cache.
-        GridCache<Integer, Integer> c = g.cache(null);
-
-        for (int i = 0; i < keyCnt; i++)
-            c.putx(i, i);
-
-        final AtomicInteger cnt = new AtomicInteger();
-
-        final AtomicBoolean done = new AtomicBoolean();
-
-        final CacheQuery<Map.Entry<Integer, Integer>> qry = 
c.queries().createScanQuery(null);
-
-        IgniteFuture<?> fut = multithreadedAsync(
-            new CAX() {
-                @Override public void applyx() throws IgniteCheckedException {
-                    int iter = 0;
-
-                    while (!done.get() && 
!Thread.currentThread().isInterrupted()) {
-                        iter++;
-
-                        CacheQueryFuture<Map.Entry<Integer, Integer>> fut = 
qry.execute();
-
-                        Collection<Map.Entry<Integer, Integer>> entries = 
fut.get();
-
-                        assert entries != null;
-
-                        assertEquals("Entries count is not as expected on 
iteration: " + iter, keyCnt, entries.size());
-
-                        if (cnt.incrementAndGet() % logMod == 0) {
-                            GridCacheQueryManager<Object, Object> qryMgr =
-                                
((GridKernal)g).internalCache().context().queries();
-
-                            assert qryMgr != null;
-
-                            qryMgr.printMemoryStats();
-                        }
-                    }
-                }
-            }, threadCnt);
-
-        Thread.sleep(DURATION);
-
-        done.set(true);
-
-        fut.get();
-    }
-
-    /**
-     * Test value.
-     */
-    private static class TestValue implements Serializable {
-        /** Value. */
-        @CacheQuerySqlField
-        private int val;
-
-        /**
-         * @param val Value.
-         */
-        private TestValue(int val) {
-            this.val = val;
-        }
-
-        /**
-         * @return Value.
-         */
-        public int value() {
-            return val;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df488d08/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryOffheapEvictsMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryOffheapEvictsMultiThreadedSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryOffheapEvictsMultiThreadedSelfTest.java
deleted file mode 100644
index e815ae5..0000000
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryOffheapEvictsMultiThreadedSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-/**
- * Multi-threaded tests for cache queries.
- */
-public class GridCacheQueryOffheapEvictsMultiThreadedSelfTest extends 
GridCacheQueryOffheapMultiThreadedSelfTest {
-    /** {@inheritDoc} */
-    @Override protected boolean evictsEnabled() {
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df488d08/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryOffheapMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryOffheapMultiThreadedSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryOffheapMultiThreadedSelfTest.java
deleted file mode 100644
index 35bf001..0000000
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryOffheapMultiThreadedSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-/**
- * Queries over off-heap indexes.
- */
-public class GridCacheQueryOffheapMultiThreadedSelfTest extends 
GridCacheQueryMultiThreadedSelfTest {
-    /** {@inheritDoc} */
-    @Override protected boolean offheapEnabled() {
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df488d08/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
deleted file mode 100644
index 4681028..0000000
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- *
- */
-public class GridCacheSqlQueryMultiThreadedSelfTest extends 
GridCommonAbstractTest {
-    /** */
-    private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
-
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-        disco.setIpFinder(ipFinder);
-
-        c.setDiscoverySpi(disco);
-
-        CacheConfiguration ccfg = new CacheConfiguration();
-
-        ccfg.setCacheMode(PARTITIONED);
-        ccfg.setDistributionMode(PARTITIONED_ONLY);
-        ccfg.setQueryIndexEnabled(true);
-        ccfg.setBackups(1);
-        ccfg.setAtomicityMode(TRANSACTIONAL);
-
-        c.setCacheConfiguration(ccfg);
-
-        return c;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        super.beforeTestsStarted();
-
-        startGrids(2);
-
-        awaitPartitionMapExchange();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        super.afterTestsStopped();
-
-        stopAllGrids();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testQuery() throws Exception {
-        final GridCache<Integer, Person> cache = grid(0).cache(null);
-
-        for (int i = 0; i < 2000; i++)
-            cache.put(i, new Person(i));
-
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
-                for (int i = 0; i < 100; i++) {
-                    CacheQuery<Map.Entry<Integer, Person>> qry =
-                        cache.queries().createSqlQuery("Person", "age >= 0");
-
-                    qry.includeBackups(false);
-                    qry.enableDedup(true);
-                    qry.keepAll(true);
-                    qry.pageSize(50);
-
-                    CacheQueryFuture<Map.Entry<Integer, Person>> fut = 
qry.execute();
-
-                    int cnt = 0;
-
-                    while (fut.next() != null)
-                        cnt++;
-
-                    assertEquals(2000, cnt);
-                }
-
-                return null;
-            }
-        }, 16, "test");
-    }
-
-    /**
-     *
-     */
-    private static class Person implements Serializable {
-        /** */
-        @CacheQuerySqlField
-        private int age;
-
-        /**
-         * @param age Age.
-         */
-        Person(int age) {
-            this.age = age;
-        }
-
-        /**
-         * @return Age/
-         */
-        public int age() {
-            return age;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df488d08/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index dc433c3..7cc72e0 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.spi.swapspace.noop.*;
-import 
org.apache.ignite.internal.processors.cache.GridCacheAbstractQuerySelfTest.*;
+import 
org.apache.ignite.internal.processors.cache.IgniteCacheAbstractQuerySelfTest.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;

Reply via email to