http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java index 623862b..20751eb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java @@ -120,7 +120,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { assert cache.size() == PUT_CNT; Collection<Cache.Entry<Integer, ValueObject>> res = - cache.query(new QuerySqlPredicate(ValueObject.class, "val >= 0")).getAll(); + cache.query(new QuerySql(ValueObject.class, "val >= 0")).getAll(); assertNotNull(res); assertEquals(PUT_CNT, res.size()); @@ -140,7 +140,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { assert cache.size() == PUT_CNT; Collection<Cache.Entry<Integer, ValueObject>> res = - cache.query(new QuerySqlPredicate(ValueObject.class, "val >= 0")).getAll(); + cache.query(new QuerySql(ValueObject.class, "val >= 0")).getAll(); assert res != null; assert res.size() == PUT_CNT; @@ -162,7 +162,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { assert cache.size() == PUT_CNT - 5; Collection<Cache.Entry<Integer, ValueObject>> res = - cache.query(new QuerySqlPredicate(ValueObject.class, "val >= 0")).getAll(); + cache.query(new QuerySql(ValueObject.class, "val >= 0")).getAll(); assert res != null; assert res.size() == PUT_CNT - 5; @@ -186,7 +186,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { assert cache.size() == PUT_CNT - 5; Collection<Cache.Entry<Integer, ValueObject>> res = - cache.query(new QuerySqlPredicate(ValueObject.class, "val >= 0")).getAll(); + cache.query(new QuerySql(ValueObject.class, "val >= 0")).getAll(); assert res != null; assert res.size() == PUT_CNT - 5;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java index 8ace6e7..614b4dd 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java @@ -259,8 +259,8 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final IgniteCache<Integer, Long> cl = g.jcache(null); assertEquals(0, g.cache(null).size()); - assertEquals(0, c.query(new QuerySqlPredicate(String.class, "1 = 1")).getAll().size()); - assertEquals(0, cl.query(new QuerySqlPredicate(Long.class, "1 = 1")).getAll().size()); + assertEquals(0, c.query(new QuerySql(String.class, "1 = 1")).getAll().size()); + assertEquals(0, cl.query(new QuerySql(Long.class, "1 = 1")).getAll().size()); Random rnd = new Random(); @@ -300,7 +300,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes int from = rnd.nextInt(valCnt); QueryCursor<Cache.Entry<Integer, String>> qry = c.query( - new QuerySqlPredicate(String.class, "_val between ? and ?").setArgs( + new QuerySql(String.class, "_val between ? and ?").setArgs( String.valueOf(from), String.valueOf(from + 250))); Collection<Cache.Entry<Integer, String>> res = qry.getAll(); @@ -340,8 +340,8 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final IgniteCache<Integer, String> c1 = g.jcache(null); assertEquals(0, g.cache(null).size()); - assertEquals(0, c1.query(new QuerySqlPredicate(String.class, "1 = 1")).getAll().size()); - assertEquals(0, c.query(new QuerySqlPredicate(Long.class, "1 = 1")).getAll().size()); + assertEquals(0, c1.query(new QuerySql(String.class, "1 = 1")).getAll().size()); + assertEquals(0, c.query(new QuerySql(Long.class, "1 = 1")).getAll().size()); Random rnd = new Random(); @@ -382,7 +382,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes case 4: int from = rnd.nextInt(valCnt); - Collection<Cache.Entry<Integer, Long>> res = c.query(new QuerySqlPredicate(Long.class, + Collection<Cache.Entry<Integer, Long>> res = c.query(new QuerySql(Long.class, "_val between ? and ?").setArgs(from, from + 250)).getAll(); for (Cache.Entry<Integer, Long> ignored : res) { @@ -419,7 +419,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final IgniteCache<Integer, Object> c = g.jcache(null); assertEquals(0, g.jcache(null).size()); - assertEquals(0, c.query(new QuerySqlPredicate(Object.class, "1 = 1")).getAll().size()); + assertEquals(0, c.query(new QuerySql(Object.class, "1 = 1")).getAll().size()); Random rnd = new Random(); @@ -462,7 +462,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes int from = rnd.nextInt(valCnt); Collection<Cache.Entry<Integer, Object>> res = c.query( - new QuerySqlPredicate(Object.class, "_val between ? and ?").setArgs(from, from + 250)) + new QuerySql(Object.class, "_val between ? and ?").setArgs(from, from + 250)) .getAll(); for (Cache.Entry<Integer, Object> ignored : res) { @@ -497,7 +497,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final IgniteCache<Integer, TestValue> c = g.jcache(null); assertEquals(0, g.cache(null).size()); - assertEquals(0, c.query(new QuerySqlPredicate(TestValue.class, "1 = 1")).getAll().size()); + assertEquals(0, c.query(new QuerySql(TestValue.class, "1 = 1")).getAll().size()); Random rnd = new Random(); @@ -539,7 +539,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes int from = rnd.nextInt(valCnt); Collection<Cache.Entry<Integer, TestValue>> res = - c.query(new QuerySqlPredicate(TestValue.class, "TestValue.val between ? and ?").setArgs( + c.query(new QuerySql(TestValue.class, "TestValue.val between ? and ?").setArgs( from, from + 250)).getAll(); for (Cache.Entry<Integer, TestValue> ignored : res) { @@ -592,7 +592,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes iter++; Collection<Cache.Entry<Integer, Integer>> entries = - c.query(new QuerySqlPredicate(Integer.class, "_val >= 0")).getAll(); + c.query(new QuerySql(Integer.class, "_val >= 0")).getAll(); assert entries != null; @@ -654,7 +654,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes iter++; Collection<Cache.Entry<Integer, Integer>> entries = - c.query(new QuerySqlPredicate(Integer.class, "_val >= 0")).getAll(); + c.query(new QuerySql(Integer.class, "_val >= 0")).getAll(); assert entries != null; @@ -712,7 +712,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes // Scan query. Collection<Cache.Entry<Integer, Integer>> entries = - c.query(new QueryScanPredicate<Integer, Integer>()).getAll(); + c.query(new QueryScan<Integer, Integer>()).getAll(); assert entries != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java index 4e89ad2..ee3d281 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; @@ -96,7 +95,7 @@ public class IgniteCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstract @Override public Void call() throws Exception { for (int i = 0; i < 100; i++) { Iterator<Cache.Entry<Integer, Person>> iter = - cache.query(QueryPredicate.sql("age >= 0").setType("Person")).iterator(); + cache.query(Query.sql("age >= 0").setType("Person")).iterator(); int cnt = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java index 056f878..cd28de9 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java @@ -45,7 +45,7 @@ public class IgniteCacheAtomicFieldsQuerySelfTest extends IgniteCachePartitioned */ public void testUnsupportedOperations() { try { - QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(new QuerySqlPredicate( + QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(new QuerySql( "update Person set name = ?").setArgs("Mary Poppins")); qry.getAll(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java index ecf7e6f..c632724 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java @@ -63,7 +63,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer assertEquals(4, cache0.size()); QueryCursor<Cache.Entry<UUID, Person>> qry = - cache0.localQuery(new QuerySqlPredicate(Person.class, "salary < 2000")); + cache0.localQuery(new QuerySql(Person.class, "salary < 2000")); Collection<Cache.Entry<UUID, Person>> entries = qry.getAll(); @@ -96,14 +96,14 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer // Fields query QueryCursor<List<?>> qry = cache0 - .queryFields(new QuerySqlPredicate("select name from Person where salary > ?").setArgs(1600)); + .queryFields(new QuerySql("select name from Person where salary > ?").setArgs(1600)); Collection<List<?>> res = qry.getAll(); assertEquals(3, res.size()); // Fields query count(*) - qry = cache0.queryFields(new QuerySqlPredicate("select count(*) from Person")); + qry = cache0.queryFields(new QuerySql("select count(*) from Person")); res = qry.getAll(); @@ -136,7 +136,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer assert grid(0).nodes().size() == gridCount(); QueryCursor<Cache.Entry<UUID, Person>> qry = - cache0.query(new QuerySqlPredicate(Person.class, "salary < 2000")); + cache0.query(new QuerySql(Person.class, "salary < 2000")); // Execute on full projection, duplicates are expected. Collection<Cache.Entry<UUID, Person>> entries = qry.getAll(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java index 002a462..a7cfa44 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java @@ -121,7 +121,7 @@ public class IgniteCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTe @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { Collection<Cache.Entry<Integer, Integer>> res = - cache.query(new QuerySqlPredicate(Integer.class, "_val >= 0")).getAll(); + cache.query(new QuerySql(Integer.class, "_val >= 0")).getAll(); assertFalse(res.isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java index 9b39e20..d4ddef4 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java @@ -56,7 +56,7 @@ public class IgniteCacheReplicatedFieldsQuerySelfTest extends IgniteCacheAbstrac for (int i = 0; i < maximumQueryIteratorCount + 1; i++) { QueryCursor<List<?>> q = cache - .queryFields(new QuerySqlPredicate("select _key from Integer where _key >= 0 order by _key")); + .queryFields(new QuerySql("select _key from Integer where _key >= 0 order by _key")); assertEquals(0, q.iterator().next().get(0)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java index 7a9a52a..cc8bc61 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java @@ -121,7 +121,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery assertEquals(0, c.size()); Collection<Cache.Entry<Integer, Integer>> res = - c.query(new QuerySqlPredicate(Integer.class, "_key >= 5 order by _key")).getAll(); + c.query(new QuerySql(Integer.class, "_key >= 5 order by _key")).getAll(); assertEquals(5, res.size()); @@ -155,7 +155,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery assertEquals(keyCnt, cache3.size()); QueryCursor<Cache.Entry<CacheKey, CacheValue>> qry = - cache1.query(new QuerySqlPredicate(CacheValue.class, "true")); + cache1.query(new QuerySql(CacheValue.class, "true")); Iterator<Cache.Entry<CacheKey, CacheValue>> iter = qry.iterator(); @@ -240,13 +240,13 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery latch.await(); QueryCursor<Cache.Entry<CacheKey, CacheValue>> qry = - cache1.query(new QuerySqlPredicate(CacheValue.class, "val > 1 and val < 4")); + cache1.query(new QuerySql(CacheValue.class, "val > 1 and val < 4")); // Distributed query. assertEquals(6, qry.getAll().size()); // Create new query, old query cannot be modified after it has been executed. - qry = cache3.localQuery(new QuerySqlPredicate(CacheValue.class, "val > 1 and val < 4")); + qry = cache3.localQuery(new QuerySql(CacheValue.class, "val > 1 and val < 4")); // Tests execute on node. Iterator<Cache.Entry<CacheKey, CacheValue>> iter = qry.iterator(); @@ -295,7 +295,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery // Create query with key filter. QueryCursor<Cache.Entry<CacheKey, CacheValue>> qry = - cache1.query(new QuerySqlPredicate(CacheValue.class, "val > 0")); + cache1.query(new QuerySql(CacheValue.class, "val > 0")); assertEquals(keyCnt * 3, qry.getAll().size()); @@ -317,7 +317,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery for (int i = 0; i < cache.getConfiguration(CacheConfiguration.class).getMaximumQueryIteratorCount() + 1; i++) { QueryCursor<Cache.Entry<Integer, Integer>> q = - cache.query(new QuerySqlPredicate(Integer.class, "_key >= 0 order by _key")); + cache.query(new QuerySql(Integer.class, "_key >= 0 order by _key")); assertEquals(0, (int)q.iterator().next().getKey()); @@ -356,7 +356,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery cache.put(i, i); QueryCursor<Cache.Entry<Integer, Integer>> q = - cache.query(new QuerySqlPredicate(Integer.class, "_key >= 0 order by _key")); + cache.query(new QuerySql(Integer.class, "_key >= 0 order by _key")); assertEquals(0, (int) q.iterator().next().getKey()); @@ -415,7 +415,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery */ private void checkQueryResults(IgniteCache<CacheKey, CacheValue> cache) throws Exception { QueryCursor<Cache.Entry<CacheKey, CacheValue>> qry = - cache.localQuery(new QuerySqlPredicate(CacheValue.class, "val > 1 and val < 4")); + cache.localQuery(new QuerySql(CacheValue.class, "val > 1 and val < 4")); Iterator<Cache.Entry<CacheKey, CacheValue>> iter = qry.iterator(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9e2e5e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java index 3dfbb1d..8e1a828 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java @@ -55,7 +55,7 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT // Tests equals query. QueryCursor<Cache.Entry<Integer, String>> qry = - cache.localQuery(new QuerySqlPredicate(String.class, "_val='value1'")); + cache.localQuery(new QuerySql(String.class, "_val='value1'")); Iterator<Cache.Entry<Integer, String>> iter = qry.iterator(); @@ -68,7 +68,7 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT assert "value1".equals(entry.getValue()); // Tests like query. - qry = cache.localQuery(new QuerySqlPredicate(String.class, "_val like 'value%'")); + qry = cache.localQuery(new QuerySql(String.class, "_val like 'value%'")); iter = qry.iterator();
