http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 39f6073..a5fc80b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; @@ -123,7 +123,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { CacheConfiguration cacheCfg = defaultCacheConfiguration(); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setSwapEnabled(true); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(1); @@ -136,7 +136,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { cacheCfg.setEvictionPolicy(null); - GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); qcfg.setIndexPrimitiveKey(true); qcfg.setIndexPrimitiveValue(true); @@ -192,8 +192,8 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @return Cache to use in tests. * @throws Exception If failed. */ - private GridCache<Long, Long> populate() throws Exception { - GridCache<Long, Long> cache = grid(0).cache(null); + private Cache<Long, Long> populate() throws Exception { + Cache<Long, Long> cache = grid(0).cache(null); assertEquals(0, cache.size()); assertEquals(0, cache.offHeapEntriesCount()); @@ -213,7 +213,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { assert val != null; assert val == i; - GridCacheEntry<Long, Long> entry = cache.entry(i); + CacheEntry<Long, Long> entry = cache.entry(i); assert entry != null; @@ -263,9 +263,9 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void checkEntries(GridCacheProjection<Long, Long> cache) throws Exception { + private void checkEntries(CacheProjection<Long, Long> cache) throws Exception { for (long i = from; i < to; i++) { - GridCacheEntry<Long, Long> entry = cache.entry(i); + CacheEntry<Long, Long> entry = cache.entry(i); assert entry != null; assert entry.getKey() != null; @@ -343,7 +343,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIterators() throws Exception { - GridCache<Long, Long> cache = populate(); + Cache<Long, Long> cache = populate(); int cnt = 0; @@ -381,7 +381,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSql() throws Exception { - GridCache<Long, Long> cache = populate(); + Cache<Long, Long> cache = populate(); Collection<Map.Entry<Long, Long>> res = cache.queries(). createSqlQuery(Long.class, "_val >= ? and _val < ?"). @@ -407,12 +407,12 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { } /** - * Tests {@link GridCacheProjection#promote(Object)} behavior on offheaped entries. + * Tests {@link org.apache.ignite.cache.CacheProjection#promote(Object)} behavior on offheaped entries. * * @throws Exception If failed. */ public void testUnswap() throws Exception { - GridCache<Long, Long> cache = populate(); + Cache<Long, Long> cache = populate(); for (long i = from; i < to; i++) { Long val = cache.promote(i); @@ -438,7 +438,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testUnswapAll() throws Exception { - GridCache<Long, Long> cache = populate(); + Cache<Long, Long> cache = populate(); Collection<Long> keys = new HashSet<>(); @@ -461,7 +461,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testGet() throws Exception { - GridCache<Long, Long> cache = populate(); + Cache<Long, Long> cache = populate(); for (long i = from; i < to; i++) { Long val = cache.get(i); @@ -480,12 +480,12 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { } /** - * Tests {@link GridCacheProjection#peek(Object)} behavior on offheaped entries. + * Tests {@link org.apache.ignite.cache.CacheProjection#peek(Object)} behavior on offheaped entries. * * @throws Exception If failed. */ public void testPeek() throws Exception { - GridCache<Long, Long> cache = populate(); + Cache<Long, Long> cache = populate(); for (long i = from; i < to; i++) { assertNull(cache.peek(i)); @@ -510,7 +510,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIteratorsCleanup() throws Exception { - final GridCache<Long, Long> cache = populate(); + final Cache<Long, Long> cache = populate(); IgniteFuture<?> offHeapFut = multithreadedAsync(new Runnable() { @Override public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java index cc2028d..0545b7c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -33,12 +34,11 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test that entries are indexed on load/reload methods. @@ -112,7 +112,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCache() throws Exception { - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); cache.loadCache(null, 0); @@ -130,7 +130,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheAsync() throws Exception { - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); cache.loadCacheAsync(null, 0).get(); @@ -148,7 +148,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheFiltered() throws Exception { - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); cache.loadCache(new P2<Integer, ValueObject>() { @Override public boolean apply(Integer key, ValueObject val) { @@ -170,7 +170,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheAsyncFiltered() throws Exception { - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); cache.loadCacheAsync(new P2<Integer, ValueObject>() { @Override public boolean apply(Integer key, ValueObject val) { @@ -194,7 +194,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { public void testReload() throws Exception { STORE_MAP.put(1, new ValueObject(1)); - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); ValueObject vo = cache.reload(1); @@ -217,7 +217,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { public void testReloadAsync() throws Exception { STORE_MAP.put(1, new ValueObject(1)); - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); assert cache.reloadAsync(1).get().value() == 1; @@ -238,7 +238,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < PUT_CNT; i++) STORE_MAP.put(i, new ValueObject(i)); - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); Integer[] keys = new Integer[PUT_CNT - 5]; @@ -280,7 +280,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < PUT_CNT; i++) STORE_MAP.put(i, new ValueObject(i)); - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); Integer[] keys = new Integer[PUT_CNT - 5]; @@ -320,7 +320,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReloadAllFiltered() throws Exception { - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); for (int i = 0; i < PUT_CNT; i++) assert cache.putx(i, new ValueObject(i)); @@ -338,8 +338,8 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { assert cache.isEmpty(); assertEquals(0, cache.size()); - cache.projection(new P1<GridCacheEntry<Integer, ValueObject>>() { - @Override public boolean apply(GridCacheEntry<Integer, ValueObject> e) { + cache.projection(new P1<CacheEntry<Integer, ValueObject>>() { + @Override public boolean apply(CacheEntry<Integer, ValueObject> e) { return e.getKey() >= 5; } }).reloadAll(Arrays.asList(keys)); @@ -358,7 +358,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReloadAllAsyncFiltered() throws Exception { - GridCache<Integer, ValueObject> cache = cache(); + Cache<Integer, ValueObject> cache = cache(); for (int i = 0; i < PUT_CNT; i++) assert cache.putx(i, new ValueObject(i)); @@ -376,8 +376,8 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { assert cache.isEmpty(); assertEquals(0, cache.size()); - cache.projection(new P1<GridCacheEntry<Integer, ValueObject>>() { - @Override public boolean apply(GridCacheEntry<Integer, ValueObject> e) { + cache.projection(new P1<CacheEntry<Integer, ValueObject>>() { + @Override public boolean apply(CacheEntry<Integer, ValueObject> e) { return e.getKey() >= 5; } }).reloadAllAsync(Arrays.asList(keys)).get(); @@ -412,7 +412,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<? extends Integer, ? extends ValueObject> e) { + @Override public void write(javax.cache.Cache.Entry<? extends Integer, ? extends ValueObject> e) { assert e != null; assert e.getKey() != null; assert e.getValue() != null; @@ -433,7 +433,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { */ private static class ValueObject { /** Value. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java index 94f8cef..f7e2ac0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for cache query metrics. @@ -68,7 +68,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(CACHE_MODE); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); qcfg.setIndexPrimitiveKey(true); @@ -85,15 +85,15 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testAccumulativeMetrics() throws Exception { - GridCache<String, Integer> cache = cache(0); + Cache<String, Integer> cache = cache(0); - GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") + CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") .projection(grid(0)); // Execute query. qry.execute().get(); - GridCacheQueryMetrics m = cache.queries().metrics(); + CacheQueryMetrics m = cache.queries().metrics(); assert m != null; @@ -127,15 +127,15 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testSingleQueryMetrics() throws Exception { - GridCache<String, Integer> cache = cache(0); + Cache<String, Integer> cache = cache(0); - GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") + CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") .projection(grid(0)); // Execute. qry.execute().get(); - GridCacheQueryMetrics m = qry.metrics(); + CacheQueryMetrics m = qry.metrics(); info("Metrics: " + m); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 index 06e8858..6ecf820 100644 --- 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 @@ -88,13 +88,13 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setAtomicityMode(TRANSACTIONAL); - cacheCfg.setDistributionMode(GridCacheDistributionMode.NEAR_PARTITIONED); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setSwapEnabled(true); cacheCfg.setBackups(1); - cacheCfg.setEvictionPolicy(evictsEnabled() ? new GridCacheLruEvictionPolicy(100) : null); + cacheCfg.setEvictionPolicy(evictsEnabled() ? new CacheLruEvictionPolicy(100) : null); - GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); qcfg.setIndexPrimitiveKey(true); @@ -153,7 +153,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest // Clean up all caches. for (int i = 0; i < GRID_CNT; i++) { - GridCache<Object, Object> c = grid(i).cache(null); + Cache<Object, Object> c = grid(i).cache(null); assertEquals(0, c.size()); } @@ -182,9 +182,9 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest // Clean up all caches. for (int i = 0; i < GRID_CNT; i++) { - GridCache<Object, Object> c = grid(i).cache(null); + Cache<Object, Object> c = grid(i).cache(null); - c.removeAll(F.<GridCacheEntry<Object, Object>>alwaysTrue()); + c.removeAll(F.<CacheEntry<Object, Object>>alwaysTrue()); Iterator<Map.Entry<Object, Object>> it = c.swapIterator(); @@ -242,7 +242,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final GridCache<Integer, String> c = g.cache(null); + final Cache<Integer, String> c = g.cache(null); assertEquals(0, g.cache(null).size()); assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 1").execute().get().size()); @@ -283,12 +283,12 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest break; case 4: - GridCacheQuery<Map.Entry<Integer, String>> qry = c.queries().createSqlQuery( + CacheQuery<Map.Entry<Integer, String>> qry = c.queries().createSqlQuery( String.class, "_val between ? and ?"); int from = rnd.nextInt(valCnt); - GridCacheQueryFuture<Map.Entry<Integer, String>> fut = + CacheQueryFuture<Map.Entry<Integer, String>> fut = qry.execute(String.valueOf(from), String.valueOf(from + 250)); Collection<Map.Entry<Integer, String>> res = fut.get(); @@ -322,7 +322,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final GridCache<Integer, Long> c = g.cache(null); + final Cache<Integer, Long> c = g.cache(null); assertEquals(0, g.cache(null).size()); assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 1").execute().get().size()); @@ -365,13 +365,13 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest break; case 4: - GridCacheQuery<Map.Entry<Integer, Long>> qry = c.queries().createSqlQuery( + CacheQuery<Map.Entry<Integer, Long>> qry = c.queries().createSqlQuery( Long.class, "_val between ? and ?"); int from = rnd.nextInt(valCnt); - GridCacheQueryFuture<Map.Entry<Integer, Long>> f = qry.execute(from, from + 250); + CacheQueryFuture<Map.Entry<Integer, Long>> f = qry.execute(from, from + 250); Collection<Map.Entry<Integer, Long>> res = f.get(); @@ -404,7 +404,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final GridCache<Integer, Object> c = g.cache(null); + final Cache<Integer, Object> c = g.cache(null); assertEquals(0, g.cache(null).size()); assertEquals(0, c.offHeapEntriesCount()); @@ -450,13 +450,13 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest break; case 4: - GridCacheQuery<Map.Entry<Integer, Object>> qry = c.queries().createSqlQuery( + CacheQuery<Map.Entry<Integer, Object>> qry = c.queries().createSqlQuery( rnd.nextBoolean() ? Long.class : String.class, "_val between ? and ?"); int from = rnd.nextInt(valCnt); - GridCacheQueryFuture<Map.Entry<Integer, Object>> f = qry.execute(from, from + 250); + CacheQueryFuture<Map.Entry<Integer, Object>> f = qry.execute(from, from + 250); Collection<Map.Entry<Integer, Object>> res = f.get(); @@ -487,7 +487,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final GridCache<Integer, TestValue> c = g.cache(null); + final Cache<Integer, TestValue> c = g.cache(null); assertEquals(0, g.cache(null).size()); assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 1").execute().get().size()); @@ -530,12 +530,12 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest break; case 4: - GridCacheQuery<Map.Entry<Integer, TestValue>> qry = c.queries().createSqlQuery( + CacheQuery<Map.Entry<Integer, TestValue>> qry = c.queries().createSqlQuery( Long.class, "TestValue.val between ? and ?"); int from = rnd.nextInt(valCnt); - GridCacheQueryFuture<Map.Entry<Integer, TestValue>> f = qry.execute(from, from + 250); + CacheQueryFuture<Map.Entry<Integer, TestValue>> f = qry.execute(from, from + 250); Collection<Map.Entry<Integer, TestValue>> res = f.get(); @@ -568,7 +568,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - GridCache<Integer, Integer> c = g.cache(null); + Cache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) { c.putx(i, i); @@ -582,7 +582,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final AtomicBoolean done = new AtomicBoolean(); - final GridCacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createSqlQuery(Integer.class, "_val >= 0"); + final CacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createSqlQuery(Integer.class, "_val >= 0"); IgniteFuture<?> fut = multithreadedAsync( new CAX() { @@ -592,7 +592,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest while (!done.get() && !Thread.currentThread().isInterrupted()) { iter++; - GridCacheQueryFuture<Map.Entry<Integer, Integer>> fut = qry.execute(); + CacheQueryFuture<Map.Entry<Integer, Integer>> fut = qry.execute(); Collection<Map.Entry<Integer, Integer>> entries = fut.get(); @@ -636,7 +636,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final GridCache<Integer, Integer> c = g.cache(null); + final Cache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) { c.putx(i, i); @@ -655,10 +655,10 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest while (!done.get() && !Thread.currentThread().isInterrupted()) { iter++; - GridCacheQuery<Map.Entry<Integer, Integer>> qry = + CacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createSqlQuery(Integer.class, "_val >= 0"); - GridCacheQueryFuture<Map.Entry<Integer, Integer>> fut = qry.execute(); + CacheQueryFuture<Map.Entry<Integer, Integer>> fut = qry.execute(); Collection<Map.Entry<Integer, Integer>> entries = fut.get(); @@ -699,12 +699,12 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - GridCache<Integer, Integer> c = g.cache(null); + Cache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) c.putx(i, i); - final GridCacheQuery<Map.Entry<Integer, Integer>> rdcQry = + final CacheQuery<Map.Entry<Integer, Integer>> rdcQry = c.queries().createSqlQuery(Integer.class, "_val > 1 and _val < 4"); rdcQry.includeBackups(true); @@ -788,7 +788,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - GridCache<Integer, Integer> c = g.cache(null); + Cache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) c.putx(i, i); @@ -797,7 +797,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final AtomicBoolean done = new AtomicBoolean(); - final GridCacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createScanQuery(null); + final CacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createScanQuery(null); IgniteFuture<?> fut = multithreadedAsync( new CAX() { @@ -807,7 +807,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest while (!done.get() && !Thread.currentThread().isInterrupted()) { iter++; - GridCacheQueryFuture<Map.Entry<Integer, Integer>> fut = qry.execute(); + CacheQueryFuture<Map.Entry<Integer, Integer>> fut = qry.execute(); Collection<Map.Entry<Integer, Integer>> entries = fut.get(); @@ -839,7 +839,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest */ private static class TestValue implements Serializable { /** Value. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private int val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java index 1785f8a..d5b5321 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java @@ -27,29 +27,29 @@ import java.io.*; @SuppressWarnings("unused") public class GridCacheQueryTestValue implements Serializable { /** */ - @GridCacheQueryTextField - @GridCacheQuerySqlField(name = "fieldname") + @CacheQueryTextField + @CacheQuerySqlField(name = "fieldname") private String field1; /** */ private int field2; /** */ - @GridCacheQuerySqlField(unique = true) + @CacheQuerySqlField(unique = true) private long field3; /** */ - @GridCacheQuerySqlField(orderedGroups = { - @GridCacheQuerySqlField.Group(name = "grp1", order = 1), - @GridCacheQuerySqlField.Group(name = "grp2", order = 2)}) + @CacheQuerySqlField(orderedGroups = { + @CacheQuerySqlField.Group(name = "grp1", order = 1), + @CacheQuerySqlField.Group(name = "grp2", order = 2)}) private long field4; /** */ - @GridCacheQuerySqlField(orderedGroups = {@GridCacheQuerySqlField.Group(name = "grp1", order = 2)}) + @CacheQuerySqlField(orderedGroups = {@CacheQuerySqlField.Group(name = "grp1", order = 2)}) private long field5; /** */ - @GridCacheQuerySqlField(orderedGroups = {@GridCacheQuerySqlField.Group(name = "grp1", order = 3)}) + @CacheQuerySqlField(orderedGroups = {@CacheQuerySqlField.Group(name = "grp1", order = 3)}) private GridCacheQueryEmbeddedValue field6 = new GridCacheQueryEmbeddedValue(); /** @@ -72,7 +72,7 @@ public class GridCacheQueryTestValue implements Serializable { * * @return Field. */ - @GridCacheQuerySqlField + @CacheQuerySqlField public int getField2() { return field2; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index 032bd44..1ef14c0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Multithreaded reduce query tests with lots of data. @@ -68,7 +68,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract cfg.setBackups(1); cfg.setWriteSynchronizationMode(FULL_SYNC); - GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); qcfg.setIndexPrimitiveKey(true); @@ -84,7 +84,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract final int keyCnt = 5000; final int logFreq = 500; - final GridCache<String, Integer> c = cache(); + final Cache<String, Integer> c = cache(); final CountDownLatch startLatch = new CountDownLatch(1); @@ -104,7 +104,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract }, 1); // Create query. - final GridCacheQuery<Map.Entry<String, Integer>> sumQry = + final CacheQuery<Map.Entry<String, Integer>> sumQry = c.queries().createSqlQuery(Integer.class, "_val > 0").timeout(TEST_TIMEOUT); final R1<Map.Entry<String, Integer>, Integer> rmtRdc = new R1<Map.Entry<String, Integer>, Integer>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 index 93f0cc5..66d2eac 100644 --- 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 @@ -31,7 +31,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -84,7 +84,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe * @throws Exception If failed. */ public void testQuery() throws Exception { - final GridCache<Integer, Person> cache = grid(0).cache(null); + final Cache<Integer, Person> cache = grid(0).cache(null); for (int i = 0; i < 2000; i++) cache.put(i, new Person(i)); @@ -92,7 +92,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe GridTestUtils.runMultiThreaded(new Callable<Void>() { @Override public Void call() throws Exception { for (int i = 0; i < 100; i++) { - GridCacheQuery<Map.Entry<Integer, Person>> qry = + CacheQuery<Map.Entry<Integer, Person>> qry = cache.queries().createSqlQuery("Person", "age >= 0"); qry.includeBackups(false); @@ -100,7 +100,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe qry.keepAll(true); qry.pageSize(50); - GridCacheQueryFuture<Map.Entry<Integer, Person>> fut = qry.execute(); + CacheQueryFuture<Map.Entry<Integer, Person>> fut = qry.execute(); int cnt = 0; @@ -120,7 +120,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe */ private static class Person implements Serializable { /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private int age; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index 17b3b76..4c9801b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test for cache swap. @@ -148,8 +148,8 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); - GridCache<Integer, Object> cache1 = ignite1.cache(null); - GridCache<Integer, Object> cache2 = ignite2.cache(null); + Cache<Integer, Object> cache1 = ignite1.cache(null); + Cache<Integer, Object> cache2 = ignite2.cache(null); Object v1 = new CacheValue(1); @@ -219,7 +219,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @throws InterruptedException If thread was interrupted. */ @SuppressWarnings({"BusyWait"}) - private boolean waitCacheEmpty(GridCacheProjection<Integer,Object> cache, long timeout) + private boolean waitCacheEmpty(CacheProjection<Integer,Object> cache, long timeout) throws InterruptedException { assert cache != null; assert timeout >= 0; @@ -263,7 +263,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED, EVT_SWAP_SPACE_DATA_EVICTED); - GridCache<Integer, CacheValue> cache = grid(0).cache(null); + Cache<Integer, CacheValue> cache = grid(0).cache(null); for (int i = 0; i< 20; i++) { cache.put(i, new CacheValue(i)); @@ -323,7 +323,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED); - GridCache<Integer, CacheValue> cache = grid(0).cache(null); + Cache<Integer, CacheValue> cache = grid(0).cache(null); populate(cache); evictAll(cache); @@ -371,7 +371,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { grid(0); - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 100; i++) { info("Putting: " + i); @@ -416,7 +416,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void populate(GridCacheProjection<Integer, CacheValue> cache) throws Exception { + private void populate(CacheProjection<Integer, CacheValue> cache) throws Exception { resetCounters(); for (int i = 0; i < ENTRY_CNT; i++) { @@ -427,7 +427,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { assert val != null; assert val.value() == i; - GridCacheEntry<Integer, CacheValue> entry = cache.entry(i); + CacheEntry<Integer, CacheValue> entry = cache.entry(i); assert entry != null; @@ -444,7 +444,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void evictAll(GridCacheProjection<Integer, CacheValue> cache) throws Exception { + private void evictAll(CacheProjection<Integer, CacheValue> cache) throws Exception { resetCounters(); cache.evictAll(); @@ -464,7 +464,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void query(GridCacheProjection<Integer, CacheValue> cache, + private void query(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -499,7 +499,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void unswap(GridCacheProjection<Integer, CacheValue> cache, + private void unswap(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -534,7 +534,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void unswapAll(GridCacheProjection<Integer, CacheValue> cache, + private void unswapAll(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -565,7 +565,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void get(GridCacheProjection<Integer, CacheValue> cache, + private void get(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -595,7 +595,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void peek(GridCacheProjection<Integer, CacheValue> cache, + private void peek(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -634,10 +634,10 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void checkEntries(GridCacheProjection<Integer, CacheValue> cache, + private void checkEntries(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { for (int i = lowerBound; i < upperBound; i++) { - GridCacheEntry<Integer, CacheValue> entry = cache.entry(i); + CacheEntry<Integer, CacheValue> entry = cache.entry(i); assert entry != null; assert entry.getKey() != null; @@ -655,7 +655,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { */ private static class CacheValue { /** Value. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 2a5262b..66e5bf2 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 @@ -33,7 +33,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * GG-4368 @@ -60,16 +60,16 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setPreloadMode(SYNC); cc.setSwapEnabled(true); - cc.setDistributionMode(GridCacheDistributionMode.NEAR_PARTITIONED); + cc.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED); cc.setEvictNearSynchronized(false); - cc.setEvictionPolicy(new GridCacheFifoEvictionPolicy(1000)); + cc.setEvictionPolicy(new CacheFifoEvictionPolicy(1000)); cc.setBackups(1); cc.setAtomicityMode(TRANSACTIONAL); - GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); qcfg.setIndexPrimitiveKey(true); @@ -94,7 +94,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testQuery() throws Exception { - GridCache<Integer, ObjectValue> cache = ignite.cache(null); + Cache<Integer, ObjectValue> cache = ignite.cache(null); int cnt = 10; @@ -107,7 +107,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { cache.evict(i); // Swap. } - GridCacheQuery<Map.Entry<Integer, ObjectValue>> qry = + CacheQuery<Map.Entry<Integer, ObjectValue>> qry = cache.queries().createSqlQuery(ObjectValue.class, "intVal >= ? order by intVal"); qry.enableDedup(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java index bb55f6a..270f5f1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests for fields queries. @@ -37,7 +37,7 @@ public class GridCacheAtomicFieldsQuerySelfTest extends GridCachePartitionedFiel } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } @@ -50,7 +50,7 @@ public class GridCacheAtomicFieldsQuerySelfTest extends GridCachePartitionedFiel * */ public void testUnsupportedOperations() { - GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery( + CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery( "update Person set name = ?"); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java index cc2dabf..8f0a5fc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests for atomic cache with near cache enabled. */ public class GridCacheAtomicNearEnabledFieldsQuerySelfTest extends GridCacheAtomicFieldsQuerySelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java index cdfdf3a..be19ec2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests for atomic cache with near cache enabled. @@ -32,7 +32,7 @@ public class GridCacheAtomicNearEnabledQuerySelfTest extends GridCachePartitione } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java index a128335..ad0a7db 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests for partitioned cache queries. @@ -32,7 +32,7 @@ public class GridCacheAtomicQuerySelfTest extends GridCachePartitionedQuerySelfT } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java index fac5c86..be078c4 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -40,7 +40,7 @@ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFi /** * @return Distribution. */ - protected GridCacheDistributionMode distributionMode() { + protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } @@ -62,12 +62,12 @@ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFi * @throws Exception If failed. */ public void testIncludeBackups() throws Exception { - GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery( + CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery( "select _KEY, name, age from Person"); qry.includeBackups(true); - GridCacheQueryFuture<List<?>> fut = qry.execute(); + CacheQueryFuture<List<?>> fut = qry.execute(); List<List<?>> res = new ArrayList<>(fut.get()); @@ -86,17 +86,17 @@ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFi assertEquals("Row size", 3, row.size()); if (cnt == 0 || cnt == 1) { - assertEquals("Key", new GridCacheAffinityKey<>("p1", "o1"), row.get(0)); + assertEquals("Key", new CacheAffinityKey<>("p1", "o1"), row.get(0)); assertEquals("Name", "John White", row.get(1)); assertEquals("Age", 25, row.get(2)); } else if (cnt == 2 || cnt == 3) { - assertEquals("Key", new GridCacheAffinityKey<>("p2", "o1"), row.get(0)); + assertEquals("Key", new CacheAffinityKey<>("p2", "o1"), row.get(0)); assertEquals("Name", "Joe Black", row.get(1)); assertEquals("Age", 35, row.get(2)); } else if (cnt == 4 || cnt == 5) { - assertEquals("Key", new GridCacheAffinityKey<>("p3", "o2"), row.get(0)); + assertEquals("Key", new CacheAffinityKey<>("p3", "o2"), row.get(0)); assertEquals("Name", "Mike Green", row.get(1)); assertEquals("Age", 40, row.get(2)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index b5966c7..ee33335 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -32,9 +32,9 @@ import org.apache.ignite.testframework.junits.common.*; import javax.cache.processor.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test for issue GG-3997 Total Hits and Misses display wrong value for in-memory database. @@ -91,7 +91,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac cfg.setPreloadPartitionedDelay(-1); cfg.setBackups(1); - GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); qcfg.setIndexPrimitiveKey(true); @@ -120,7 +120,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac long misses = 0; for (int i = 0; i < GRID_CNT; i++) { - GridCacheMetrics m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); hits += m.hits(); misses += m.misses(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java index 01f4022..dbbd6e3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java @@ -54,7 +54,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel Person p3 = new Person("Mike", 1800); Person p4 = new Person("Bob", 1900); - GridCache<UUID, Person> cache0 = grid(0).cache(null); + Cache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -63,7 +63,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel assertEquals(4, cache0.size()); - GridCacheQuery<Map.Entry<UUID, Person>> qry = cache0.queries().createSqlQuery(Person.class, + CacheQuery<Map.Entry<UUID, Person>> qry = cache0.queries().createSqlQuery(Person.class, "salary < 2000").projection(grid(0).forLocal()); // Include backup entries. @@ -94,7 +94,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel Ignite ignite0 = grid(0); - GridCache<UUID, Person> cache0 = ignite0.cache(null); + Cache<UUID, Person> cache0 = ignite0.cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -104,7 +104,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel assertEquals(4, cache0.size()); // Fields query - GridCacheQuery<List<?>> qry = cache0.queries().createSqlFieldsQuery("select name from Person where salary > ?"). + CacheQuery<List<?>> qry = cache0.queries().createSqlFieldsQuery("select name from Person where salary > ?"). projection(ignite0.cluster()); Collection<List<?>> res = qry.execute(1600).get(); @@ -133,7 +133,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel Person p3 = new Person("Mike", 1800); Person p4 = new Person("Bob", 1900); - GridCache<UUID, Person> cache0 = grid(0).cache(null); + Cache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -144,7 +144,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel assert grid(0).nodes().size() == gridCount(); - GridCacheQuery<Map.Entry<UUID, Person>> qry = cache0.queries().createSqlQuery(Person.class, + CacheQuery<Map.Entry<UUID, Person>> qry = cache0.queries().createSqlQuery(Person.class, "salary < 2000"); // Include backup entries and disable de-duplication. @@ -195,7 +195,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel Person p3 = new Person("Mike", 1800); Person p4 = new Person("Bob", 1900); - GridCache<UUID, Person> cache0 = grid(0).cache(null); + Cache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -204,7 +204,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel // Retry several times. for (int i = 0; i < 10; i++) { - GridCacheQuery<Map.Entry<UUID, Person>> qry = cache0.queries().createSqlQuery(Person.class, + CacheQuery<Map.Entry<UUID, Person>> qry = cache0.queries().createSqlQuery(Person.class, "salary < 2000"); // Include backup entries and disable de-duplication. @@ -235,7 +235,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel */ @SuppressWarnings("FloatingPointEquality") public void testScanReduceQuery() throws Exception { - GridCache<UUID, Person> c = ignite.cache(null); + Cache<UUID, Person> c = ignite.cache(null); Person p1 = new Person("Bob White", 1000); Person p2 = new Person("Tom White", 2000); @@ -245,7 +245,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel c.put(p2.id(), p2); c.put(p3.id(), p3); - GridCacheQuery<Map.Entry<UUID, Person>> q = c.queries().createScanQuery(new P2<UUID, Person>() { + CacheQuery<Map.Entry<UUID, Person>> q = c.queries().createScanQuery(new P2<UUID, Person>() { @Override public boolean apply(UUID k, Person p) { return p.salary() < 20000; } @@ -293,7 +293,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel */ @SuppressWarnings("FloatingPointEquality") public void testSqlReduceQuery() throws Exception { - GridCache<UUID, Person> c = ignite.cache(null); + Cache<UUID, Person> c = ignite.cache(null); Person p1 = new Person("Bob White", 1000); Person p2 = new Person("Tom White", 2000); @@ -303,7 +303,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel c.put(p2.id(), p2); c.put(p3.id(), p3); - GridCacheQuery<Map.Entry<UUID, Person>> q = c.queries().createSqlQuery(Person.class, "salary < 20000"); + CacheQuery<Map.Entry<UUID, Person>> q = c.queries().createSqlQuery(Person.class, "salary < 20000"); R1<IgnitePair<Integer>, Double> locRdc = new R1<IgnitePair<Integer>, Double>() { private double sum; @@ -347,7 +347,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel */ @SuppressWarnings("FloatingPointEquality") public void testLuceneReduceQuery() throws Exception { - GridCache<UUID, Person> c = ignite.cache(null); + Cache<UUID, Person> c = ignite.cache(null); Person p1 = new Person("Bob White", 1000); Person p2 = new Person("Tom White", 2000); @@ -357,7 +357,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel c.put(p2.id(), p2); c.put(p3.id(), p3); - GridCacheQuery<Map.Entry<UUID, Person>> q = c.queries().createFullTextQuery(Person.class, "White"); + CacheQuery<Map.Entry<UUID, Person>> q = c.queries().createFullTextQuery(Person.class, "White"); R1<IgnitePair<Integer>, Double> locRdc = new R1<IgnitePair<Integer>, Double>() { private double sum; @@ -422,9 +422,9 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel for (int i = 0; i < gridCount(); i++) assertEquals(i == 1 ? 2 : 3, grid(i).cache(null).primarySize()); - GridCache<Integer, Integer> cache = ignite.cache(null); + Cache<Integer, Integer> cache = ignite.cache(null); - GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0"); + CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0"); q.pageSize(2); q.includeBackups(false); @@ -439,12 +439,12 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel * @throws Exception If failed. */ public void testReduceWithPagination() throws Exception { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < 50; i++) assertTrue(c.putx(i, 10)); - GridCacheQuery<Map.Entry<Integer, Integer>> q = c.queries().createSqlQuery(Integer.class, "_key >= 0"); + CacheQuery<Map.Entry<Integer, Integer>> q = c.queries().createSqlQuery(Integer.class, "_key >= 0"); q.pageSize(10); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index eaadc06..859890c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -35,7 +35,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -75,11 +75,11 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest cc.setCacheMode(PARTITIONED); cc.setBackups(1); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); - GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration(); + CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); qcfg.setIndexPrimitiveKey(true); @@ -102,7 +102,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest final long nodeLifeTime = 2 * 1000; final int logFreq = 20; - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).cache(null); assert cache != null; @@ -118,7 +118,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest IgniteFuture<?> fut1 = multithreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { - GridCacheQuery<Map.Entry<Integer, Integer>> qry = + CacheQuery<Map.Entry<Integer, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0"); qry.includeBackups(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java index e9458f8..1a5931c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java @@ -66,9 +66,9 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie Ignite g = startGrid(); - GridCache<Integer, Integer> cache = g.cache(null); + Cache<Integer, Integer> cache = g.cache(null); - GridCacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery("select _key from Integer where _key >= " + + CacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery("select _key from Integer where _key >= " + "0 order by _key"); q.pageSize(50); @@ -77,7 +77,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie q = q.projection(prj); - GridCacheQueryFuture<List<?>> fut = q.execute(); + CacheQueryFuture<List<?>> fut = q.execute(); assertEquals(0, fut.next().get(0)); @@ -121,17 +121,17 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie * @throws Exception If failed. */ public void testLostIterator() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - GridCacheQueryFuture<List<?>> fut = null; + CacheQueryFuture<List<?>> fut = null; for (int i = 0; i < cache.configuration().getMaximumQueryIteratorCount() + 1; i++) { - GridCacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery( + CacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery( "select _key from Integer where _key >= 0 order by _key").projection(grid(0)); q.pageSize(50); - GridCacheQueryFuture<List<?>> f = q.execute(); + CacheQueryFuture<List<?>> f = q.execute(); assertEquals(0, f.next().get(0)); @@ -139,7 +139,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie fut = f; } - final GridCacheQueryFuture<List<?>> fut0 = fut; + final CacheQueryFuture<List<?>> fut0 = fut; GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index f45b62a..60e5e8a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -62,13 +62,13 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf private static Ignite ignite3; /** Cache1. */ - private static GridCache<CacheKey, CacheValue> cache1; + private static Cache<CacheKey, CacheValue> cache1; /** Cache2. */ - private static GridCache<CacheKey, CacheValue> cache2; + private static Cache<CacheKey, CacheValue> cache2; /** Cache3. */ - private static GridCache<CacheKey, CacheValue> cache3; + private static Cache<CacheKey, CacheValue> cache3; /** Key serialization cnt. */ private static volatile int keySerCnt; @@ -112,7 +112,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf try { Ignite g = startGrid("client"); - GridCache<Integer, Integer> c = g.cache(null); + Cache<Integer, Integer> c = g.cache(null); for (int i = 0; i < 10; i++) c.putx(i, i); @@ -158,7 +158,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf assertEquals(keyCnt, cache2.size()); assertEquals(keyCnt, cache3.size()); - GridCacheQuery<Map.Entry<CacheKey, CacheValue>> qry = cache1.queries().createSqlQuery(CacheValue.class, + CacheQuery<Map.Entry<CacheKey, CacheValue>> qry = cache1.queries().createSqlQuery(CacheValue.class, "select * from CacheValue").projection(ignite.cluster()); qry.pageSize(10); @@ -246,7 +246,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf latch.await(); - GridCacheQuery<Map.Entry<CacheKey, CacheValue>> qry = cache1.queries().createSqlQuery( + CacheQuery<Map.Entry<CacheKey, CacheValue>> qry = cache1.queries().createSqlQuery( CacheValue.class, "val > 1 and val < 4").projection(ignite.cluster()); qry.enableDedup(false); @@ -305,7 +305,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf for (int i = 1; i <= keyCnt; i++) cache1.put(new CacheKey(i), new CacheValue(String.valueOf(i))); - GridCacheQuery<Map.Entry<CacheKey, CacheValue>> rdcQry = + CacheQuery<Map.Entry<CacheKey, CacheValue>> rdcQry = cache1.queries().createSqlQuery(CacheValue.class, "val > 1 and val < 4"); rdcQry.keepAll(true); @@ -331,7 +331,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf assert !reduceIter.hasNext(); // Tests reduce query where remote reducer returns null. - GridCacheQuery<Map.Entry<CacheKey, CacheValue>> rdcQry1 = + CacheQuery<Map.Entry<CacheKey, CacheValue>> rdcQry1 = cache1.queries().createSqlQuery(CacheValue.class, "val > 1 and val < 4"); rdcQry1.keepAll(true); @@ -363,12 +363,12 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf cache1.put(new CacheKey(i), new CacheValue(String.valueOf(i))); // Create query with key filter. - GridCacheQuery<Map.Entry<CacheKey, CacheValue>> qry = + CacheQuery<Map.Entry<CacheKey, CacheValue>> qry = cache1.queries().createSqlQuery(CacheValue.class, "val > 0").projection(ignite.cluster()); qry.keepAll(true); - GridCacheQueryFuture<Map.Entry<CacheKey, CacheValue>> fut = qry.execute(); + CacheQueryFuture<Map.Entry<CacheKey, CacheValue>> fut = qry.execute(); assertEquals(keyCnt * 3, fut.get().size()); @@ -379,21 +379,21 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf * @throws Exception If failed. */ public void testLostIterator() throws Exception { - GridCache<Integer, Integer> cache = ignite.cache(null); + Cache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 1000; i++) assertTrue(cache.putx(i, i)); - GridCacheQueryFuture<Map.Entry<Integer, Integer>> fut = null; + CacheQueryFuture<Map.Entry<Integer, Integer>> fut = null; for (int i = 0; i < cache.configuration().getMaximumQueryIteratorCount() + 1; i++) { - GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, + CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0 order by _key").projection(ignite.cluster()); q.pageSize(200); q.enableDedup(true); - GridCacheQueryFuture<Map.Entry<Integer, Integer>> f = q.execute(); + CacheQueryFuture<Map.Entry<Integer, Integer>> f = q.execute(); assertEquals(0, (int)f.next().getKey()); @@ -401,7 +401,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf fut = f; } - final GridCacheQueryFuture<Map.Entry<Integer, Integer>> fut0 = fut; + final CacheQueryFuture<Map.Entry<Integer, Integer>> fut0 = fut; GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -424,19 +424,19 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf try { Ignite g = startGrid(); - GridCache<Integer, Integer> cache = g.cache(null); + Cache<Integer, Integer> cache = g.cache(null); for (int i = 0; i < 1000; i++) assertTrue(cache.putx(i, i)); - GridCacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, + CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0 order by _key").projection(ignite.cluster()); q.pageSize(50); q.projection(g.cluster().forNodes(Arrays.asList(g.cluster().localNode(), grid(0).localNode()))); - GridCacheQueryFuture<Map.Entry<Integer, Integer>> fut = q.execute(); + CacheQueryFuture<Map.Entry<Integer, Integer>> fut = q.execute(); assertEquals(0, (int)fut.next().getKey()); @@ -494,11 +494,11 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf * @param cache Cache. * @throws Exception If check failed. */ - private void checkQueryResults(Ignite ignite, GridCacheProjection<CacheKey, CacheValue> cache) throws Exception { - GridCacheQuery<Map.Entry<CacheKey, CacheValue>> qry = + private void checkQueryResults(Ignite ignite, CacheProjection<CacheKey, CacheValue> cache) throws Exception { + CacheQuery<Map.Entry<CacheKey, CacheValue>> qry = cache.queries().createSqlQuery(CacheValue.class, "val > 1 and val < 4"); - GridCacheQuery<Map.Entry<CacheKey, CacheValue>> q = qry.projection(ignite.cluster().forLocal()); + CacheQuery<Map.Entry<CacheKey, CacheValue>> q = qry.projection(ignite.cluster().forLocal()); Iterator<Map.Entry<CacheKey, CacheValue>> iter = q.execute().get().iterator(); @@ -613,7 +613,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf */ private static class CacheValue implements Externalizable { /** Value. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private String val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java index b59c410..e95f214 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java @@ -44,7 +44,7 @@ public class GridCacheLocalQuerySelfTest extends GridCacheAbstractQuerySelfTest * @throws IgniteCheckedException If test failed. */ public void testQueryLocal() throws Exception { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); cache.put(1, "value1"); cache.put(2, "value2"); @@ -53,9 +53,9 @@ public class GridCacheLocalQuerySelfTest extends GridCacheAbstractQuerySelfTest cache.put(5, "value5"); // Tests equals query. - GridCacheQuery<Map.Entry<Integer, String>> qry = cache.queries().createSqlQuery(String.class, "_val='value1'"); + CacheQuery<Map.Entry<Integer, String>> qry = cache.queries().createSqlQuery(String.class, "_val='value1'"); - GridCacheQueryFuture<Map.Entry<Integer,String>> iter = qry.execute(); + CacheQueryFuture<Map.Entry<Integer,String>> iter = qry.execute(); Map.Entry<Integer, String> entry = iter.next(); @@ -78,7 +78,7 @@ public class GridCacheLocalQuerySelfTest extends GridCacheAbstractQuerySelfTest assert iter.next() == null; // Tests reducer. - GridCacheQuery<Map.Entry<Integer, String>> rdcQry = cache.queries().createSqlQuery(String.class, + CacheQuery<Map.Entry<Integer, String>> rdcQry = cache.queries().createSqlQuery(String.class, "_val like 'value%' and _key != 2 and _val != 'value3' order by _val"); Iterator<String> iter2 = rdcQry. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java index b6b2356..10b8b55 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java @@ -92,19 +92,19 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { @SuppressWarnings("UnusedDeclaration") private static class TestValue1 { /** */ - @GridCacheQuerySqlField(index = true) + @CacheQuerySqlField(index = true) private long val1; /** */ - @GridCacheQuerySqlField(index = true) + @CacheQuerySqlField(index = true) private String val2; /** */ - @GridCacheQuerySqlField(groups = "group1") + @CacheQuerySqlField(groups = "group1") private int val3; /** */ - @GridCacheQuerySqlField(groups = "group1") + @CacheQuerySqlField(groups = "group1") private int val4; /** @@ -123,11 +123,11 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { @SuppressWarnings("UnusedDeclaration") private static class TestValue2 { /** */ - @GridCacheQuerySqlField(index = true) + @CacheQuerySqlField(index = true) private long val1; /** */ - @GridCacheQueryTextField + @CacheQueryTextField private String val2; /** @@ -149,27 +149,27 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { cache().queries().rebuildAllIndexes().get(); - GridCache<Integer, TestValue1> cache1 = grid(0).cache(null); - GridCache<Integer, TestValue2> cache2 = grid(0).cache(null); + Cache<Integer, TestValue1> cache1 = grid(0).cache(null); + Cache<Integer, TestValue2> cache2 = grid(0).cache(null); for (int i = 0; i < ENTRY_CNT; i++) { cache1.put(i, new TestValue1(i, "val2-" + i, i, i)); cache2.put(ENTRY_CNT * 2 + i, new TestValue2(i, "val2-" + i)); } - GridCacheQuery<Map.Entry<Integer, TestValue1>> qry1 = + CacheQuery<Map.Entry<Integer, TestValue1>> qry1 = cache1.queries().createSqlQuery(TestValue1.class, "val1 = 9000"); - GridCacheQuery<Map.Entry<Integer, TestValue1>> qry2 = + CacheQuery<Map.Entry<Integer, TestValue1>> qry2 = cache1.queries().createSqlQuery(TestValue1.class, "val2 = 'val2-9000'"); - GridCacheQuery<Map.Entry<Integer, TestValue1>> qry3 = + CacheQuery<Map.Entry<Integer, TestValue1>> qry3 = cache1.queries().createSqlQuery(TestValue1.class, "val3 = 9000 and val4 = 9000"); - GridCacheQuery<Map.Entry<Integer, TestValue2>> qry4 = + CacheQuery<Map.Entry<Integer, TestValue2>> qry4 = cache2.queries().createSqlQuery(TestValue2.class, "val1 = 9000"); - GridCacheQuery<Map.Entry<Integer, TestValue2>> qry5 = + CacheQuery<Map.Entry<Integer, TestValue2>> qry5 = cache2.queries().createFullTextQuery(TestValue2.class, "val2 = 'val2-9000'"); checkQueryReturnsOneEntry(qry1, qry2, qry3, qry4, qry5); @@ -195,8 +195,8 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { public void testRebuildInterrupted() throws Exception { spi.sleepInRebuild = true; - GridCache<Integer, TestValue1> cache1 = grid(0).cache(null); - GridCache<Integer, TestValue2> cache2 = grid(0).cache(null); + Cache<Integer, TestValue1> cache1 = grid(0).cache(null); + Cache<Integer, TestValue2> cache2 = grid(0).cache(null); cache1.put(0, new TestValue1(0, "val0", 0 ,0)); cache2.put(1, new TestValue2(0, "val0")); @@ -242,8 +242,8 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { /** * @throws Exception if failed. */ - private void checkQueryReturnsOneEntry(GridCacheQuery<?>... qrys) throws Exception { - for (GridCacheQuery<?> qry : qrys) + private void checkQueryReturnsOneEntry(CacheQuery<?>... qrys) throws Exception { + for (CacheQuery<?> qry : qrys) assertEquals(1, qry.execute().get().size()); } }
