ignite-sql-tests - SqlFieldsQuery
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a799c93 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a799c93 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a799c93 Branch: refs/heads/ignite-sql-tests Commit: 2a799c9348daed85df627abcda0fa6d4dd6301d4 Parents: 167549b Author: S.Vladykin <[email protected]> Authored: Mon Feb 9 01:40:56 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Mon Feb 9 01:40:56 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 4 +- .../org/apache/ignite/cache/query/Query.java | 39 +++----- .../apache/ignite/cache/query/QueryScan.java | 26 +++--- .../org/apache/ignite/cache/query/QuerySpi.java | 12 +++ .../org/apache/ignite/cache/query/QuerySql.java | 7 +- .../apache/ignite/cache/query/QueryText.java | 4 + .../ignite/cache/query/SqlFieldsQuery.java | 95 ++++++++++++++++++++ .../processors/cache/IgniteCacheProxy.java | 15 +++- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 45 ++++------ .../cache/IgniteCacheAbstractQuerySelfTest.java | 48 +++++----- ...gniteCacheSqlQueryMultiThreadedSelfTest.java | 2 +- .../IgniteCacheAtomicFieldsQuerySelfTest.java | 2 +- .../IgniteCachePartitionedQuerySelfTest.java | 9 +- ...gniteCacheReplicatedFieldsQuerySelfTest.java | 2 +- 14 files changed, 206 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index 1f0a997..fa0d7aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -212,7 +212,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * @param qry SQL Query. * @return Cursor. */ - public QueryCursor<List<?>> queryFields(QuerySql qry); + public QueryCursor<List<?>> queryFields(SqlFieldsQuery qry); /** * Queries cache locally. Accepts any subclass of {@link Query}. @@ -232,7 +232,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * @param qry SQL Query. * @return Cursor. */ - public QueryCursor<List<?>> localQueryFields(QuerySql qry); + public QueryCursor<List<?>> localQueryFields(SqlFieldsQuery qry); /** * Allows for iteration over local cache entries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java index 1e70fc8..0cdefa2 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java @@ -17,6 +17,7 @@ package org.apache.ignite.cache.query; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -25,9 +26,14 @@ import org.apache.ignite.spi.indexing.*; import java.io.*; /** - * Query to pass into any of {@code Cache.query(...)} methods. + * Base class for all Ignite cache queries. * Use {@link QuerySql} and {@link QueryText} for SQL and * text queries accordingly. + * + * @see IgniteCache#query(Query) + * @see IgniteCache#localQuery(Query) + * @see IgniteCache#queryFields(SqlFieldsQuery) + * @see IgniteCache#localQueryFields(SqlFieldsQuery) */ public abstract class Query<T extends Query> implements Serializable { /** Page size. */ @@ -41,13 +47,13 @@ public abstract class Query<T extends Query> implements Serializable { } /** - * Factory method for SQL queries. + * Factory method for SQL fields queries. * * @param sql SQL Query string. - * @return SQL Query instance. + * @return SQL Fields query instance. */ - public static QuerySql sql(String sql) { - return new QuerySql(sql); + public static SqlFieldsQuery sql(String sql) { + return new SqlFieldsQuery(sql); } /** @@ -58,17 +64,7 @@ public abstract class Query<T extends Query> implements Serializable { * @return SQL Query instance. */ public static QuerySql sql(Class<?> type, String sql) { - return sql(sql).setType(type); - } - - /** - * Factory method for Lucene fulltext queries. - * - * @param txt Search string. - * @return Fulltext query. - */ - public static QueryText text(String txt) { - return new QueryText(txt); + return new QuerySql(type, sql); } /** @@ -79,7 +75,7 @@ public abstract class Query<T extends Query> implements Serializable { * @return Fulltext query. */ public static QueryText text(Class<?> type, String txt) { - return text(txt).setType(type); + return new QueryText(txt).setType(type); } /** @@ -93,15 +89,6 @@ public abstract class Query<T extends Query> implements Serializable { } /** - * Factory method for SPI queries returning all entries. - * - * @return SPI Query. - */ - public static <K, V> QueryScan<K, V> scan() { - return new QueryScan<>(); - } - - /** * Factory method for SPI queries. * * @return SPI Query. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/core/src/main/java/org/apache/ignite/cache/query/QueryScan.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryScan.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryScan.java index 35b6299..ba7f4d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryScan.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryScan.java @@ -17,11 +17,16 @@ package org.apache.ignite.cache.query; +import org.apache.ignite.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; +import org.jetbrains.annotations.*; /** * Scan query over cache entries. Will accept all the entries if no predicate was set. + * + * @see IgniteCache#query(Query) + * @see IgniteCache#localQuery(Query) */ public class QueryScan<K, V> extends Query<QueryScan<K, V>> { /** */ @@ -31,19 +36,15 @@ public class QueryScan<K, V> extends Query<QueryScan<K, V>> { * Create scan query returning all entries. */ public QueryScan() { - this(new IgniteBiPredicate<K,V>() { - @Override public boolean apply(K k, V v) { - return true; - } - }); + this(null); } /** * Create scan query with filter. * - * @param filter Filter. + * @param filter Filter. If {@code null} then all entries will be returned. */ - public QueryScan(IgniteBiPredicate<K,V> filter) { + public QueryScan(@Nullable IgniteBiPredicate<K,V> filter) { setFilter(filter); } @@ -59,11 +60,14 @@ public class QueryScan<K, V> extends Query<QueryScan<K, V>> { /** * Sets filter. * - * @param filter Filter. + * @param filter Filter. If {@code null} then all entries will be returned. */ - public void setFilter(IgniteBiPredicate<K,V> filter) { - A.notNull(filter, "filter"); - + public void setFilter(@Nullable IgniteBiPredicate<K,V> filter) { this.filter = filter; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(QueryScan.class, this); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySpi.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySpi.java index d46f634..31710bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySpi.java @@ -17,13 +17,20 @@ package org.apache.ignite.cache.query; +import org.apache.ignite.*; +import org.apache.ignite.internal.util.tostring.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.spi.indexing.*; /** * Query to be used by {@link IndexingSpi} implementations. + * + * @see IgniteCache#query(Query) + * @see IgniteCache#localQuery(Query) */ public final class QuerySpi extends Query<QuerySpi> { /** Arguments. */ + @GridToStringInclude private Object[] args; /** @@ -46,4 +53,9 @@ public final class QuerySpi extends Query<QuerySpi> { return this; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(QuerySpi.class, this); + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java index 234a482..c409c5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java @@ -17,13 +17,16 @@ package org.apache.ignite.cache.query; +import org.apache.ignite.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; /** - * SQL Query to use with any of the {@code JCache.query(...)} and - * {@code JCache.queryFields(...)} methods. + * SQL Query. + * + * @see IgniteCache#query(Query) + * @see IgniteCache#localQuery(Query) */ public final class QuerySql extends Query<QuerySql> { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java index b6eda82..099837a 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java @@ -17,11 +17,15 @@ package org.apache.ignite.cache.query; +import org.apache.ignite.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.typedef.internal.*; /** * Query for Lucene based fulltext search. + * + * @see IgniteCache#query(Query) + * @see IgniteCache#localQuery(Query) */ public final class QueryText extends Query<QueryText> { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java new file mode 100644 index 0000000..ca1db8b --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java @@ -0,0 +1,95 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.cache.query; + +import org.apache.ignite.*; +import org.apache.ignite.internal.util.tostring.*; +import org.apache.ignite.internal.util.typedef.internal.*; + +/** + * SQL Fields query. + * + * @see IgniteCache#queryFields(SqlFieldsQuery) + * @see IgniteCache#localQueryFields(SqlFieldsQuery) + */ +public final class SqlFieldsQuery extends Query<SqlFieldsQuery>{ + /** SQL Query. */ + private String sql; + + /** Arguments. */ + @GridToStringInclude + private Object[] args; + + /** + * Constructs sql fields query. + * + * @param sql SQL Query. + */ + public SqlFieldsQuery(String sql) { + setSql(sql); + } + + /** + * Gets SQL clause. + * + * @return SQL clause. + */ + public String getSql() { + return sql; + } + + /** + * Sets SQL clause. + * + * @param sql SQL clause. + * @return {@code this} For chaining. + */ + public SqlFieldsQuery setSql(String sql) { + A.notNull(sql, "sql"); + + this.sql = sql; + + return this; + } + + /** + * Gets SQL arguments. + * + * @return SQL arguments. + */ + public Object[] getArgs() { + return args; + } + + /** + * Sets SQL arguments. + * + * @param args SQL arguments. + * @return {@code this} For chaining. + */ + public SqlFieldsQuery setArgs(Object... args) { + this.args = args; + + return this; + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(SqlFieldsQuery.class, this); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 670421d..c2ce589 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -50,6 +50,13 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V /** */ private static final long serialVersionUID = 0L; + /** */ + private static final IgniteBiPredicate ACCEPT_ALL = new IgniteBiPredicate() { + @Override public boolean apply(Object k, Object v) { + return true; + } + }; + /** Context. */ private GridCacheContext<K, V> ctx; @@ -254,7 +261,9 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V final CacheQueryFuture<Map.Entry<K,V>> fut; if (filter instanceof QueryScan) { - qry = delegate.queries().createScanQuery((IgniteBiPredicate<K,V>)filter); + IgniteBiPredicate<K,V> p = ((QueryScan)filter).getFilter(); + + qry = delegate.queries().createScanQuery(p != null ? p : ACCEPT_ALL); if (grp != null) qry.projection(grp); @@ -334,7 +343,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V } /** {@inheritDoc} */ - @Override public QueryCursor<List<?>> queryFields(QuerySql filter) { + @Override public QueryCursor<List<?>> queryFields(SqlFieldsQuery filter) { A.notNull(filter, "filter"); GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -381,7 +390,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V } /** {@inheritDoc} */ - @Override public QueryCursor<List<?>> localQueryFields(QuerySql filter) { + @Override public QueryCursor<List<?>> localQueryFields(SqlFieldsQuery filter) { A.notNull(filter, "filter"); GridCacheProjectionImpl<K, V> prev = gate.enter(prj); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index 071cc86..cbc01a6 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -38,6 +38,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.query.Query.sql; /** * Tests for fields queries. @@ -177,7 +178,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testExecute() throws Exception { QueryCursor<List<?>> qry = grid(0).jcache(null) - .queryFields(new QuerySql("select _KEY, name, age from Person")); + .queryFields(sql("select _KEY, name, age from Person")); List<List<?>> res = new ArrayList<>(qry.getAll()); @@ -223,7 +224,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testExecuteWithArguments() throws Exception { QueryCursor<List<?>> qry = grid(0).jcache(null) - .queryFields(new QuerySql("select _KEY, name, age from Person where age > ?").setArgs(30)); + .queryFields(sql("select _KEY, name, age from Person where age > ?").setArgs(30)); List<List<?>> res = new ArrayList<>(qry.getAll()); @@ -264,7 +265,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testSelectAllJoined() throws Exception { QueryCursor<List<?>> qry = grid(0).jcache(null) - .queryFields(new QuerySql("select * from Person p, Organization o where p.orgId = o.id")); + .queryFields(sql("select * from Person p, Organization o where p.orgId = o.id")); List<List<?>> res = new ArrayList<>(qry.getAll()); @@ -326,7 +327,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testEmptyResult() throws Exception { QueryCursor<List<?>> qry = grid(0).jcache(null) - .queryFields(new QuerySql("select name from Person where age = 0")); + .queryFields(sql("select name from Person where age = 0")); Collection<List<?>> res = qry.getAll(); @@ -336,7 +337,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testQueryString() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(new QuerySql("select * from String")); + QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(sql("select * from String")); Collection<List<?>> res = qry.getAll(); @@ -353,7 +354,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testQueryIntegersWithJoin() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(new QuerySql( + QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(sql( "select i._KEY, i._VAL, j._KEY, j._VAL from Integer i join Integer j where i._VAL >= 100")); Collection<List<?>> res = qry.getAll(); @@ -379,7 +380,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA public void testPagination() throws Exception { // Query with page size 20. QueryCursor<List<?>> qry = grid(0).jcache(null) - .queryFields(new QuerySql("select * from Integer").setPageSize(20)); + .queryFields(sql("select * from Integer").setPageSize(20)); List<List<?>> res = new ArrayList<>(qry.getAll()); @@ -404,7 +405,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA for (int i = 0; i < 200; i++) cache.put(i, i); - QueryCursor<List<?>> qry = cache.queryFields(new QuerySql("select * from Integer")); + QueryCursor<List<?>> qry = cache.queryFields(sql("select * from Integer")); Collection<List<?>> res = qry.getAll(); @@ -418,7 +419,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA cache.put("key", "val"); - QueryCursor<List<?>> qry = cache.queryFields(new QuerySql("select * from String")); + QueryCursor<List<?>> qry = cache.queryFields(sql("select * from String")); assert qry.getAll().isEmpty(); @@ -436,7 +437,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA cache.put(key, val); - Collection<List<?>> res = cache.queryFields(new QuerySql("select * from Person")).getAll(); + Collection<List<?>> res = cache.queryFields(sql("select * from Person")).getAll(); assertEquals(1, res.size()); @@ -482,7 +483,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA */ private void testPaginationIterator(@Nullable String cacheName) throws Exception { QueryCursor<List<?>> qry = grid(0).jcache(cacheName) - .queryFields(new QuerySql("select _key, _val from Integer").setPageSize(10)); + .queryFields(sql("select _key, _val from Integer").setPageSize(10)); int cnt = 0; @@ -499,24 +500,10 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA assertEquals(size, cnt); } - /** - * @param pageSize Page size. - * @param sql Query. - * @param args Arguments. - * @return Predicate. - */ - private QuerySql sqlPage(int pageSize, String sql, Object ... args) { - QuerySql q = new QuerySql(sql).setArgs(args); - - q.setPageSize(pageSize); - - return q; - } - /** @throws Exception If failed. */ public void testPaginationIteratorKeepAll() throws Exception { QueryCursor<List<?>> qry = grid(0).jcache(null) - .queryFields(new QuerySql("select _key, _val from Integer").setPageSize(10)); + .queryFields(sql("select _key, _val from Integer").setPageSize(10)); int cnt = 0; @@ -532,7 +519,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA assertEquals(size, cnt); - qry = grid(0).jcache(null).queryFields(sqlPage(10, "select _key, _val from Integer")); + qry = grid(0).jcache(null).queryFields(sql("select _key, _val from Integer").setPageSize(10)); List<List<?>> list = new ArrayList<>(qry.getAll()); @@ -568,7 +555,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA */ private void testPaginationGet(@Nullable String cacheName) throws Exception { QueryCursor<List<?>> qry = grid(0).jcache(null) - .queryFields(new QuerySql("select _key, _val from Integer").setPageSize(10)); + .queryFields(sql("select _key, _val from Integer").setPageSize(10)); List<List<?>> list = new ArrayList<>(qry.getAll()); @@ -591,7 +578,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testEmptyGrid() throws Exception { QueryCursor<List<?>> qry = grid(0).jcache(null) - .queryFields(new QuerySql("select name, age from Person where age = 25")); + .queryFields(sql("select name, age from Person where age = 25")); List<?> res = F.first(qry.getAll()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index 41e83c1..c3ea9cc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -213,7 +213,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put("tst", "test"); - QueryCursor<Cache.Entry<String, String>> qry = cache.query(new QuerySql(String.class, "_val='test'")); + QueryCursor<Cache.Entry<String, String>> qry = cache.query(sql(String.class, "_val='test'")); Cache.Entry<String, String> entry = F.first(qry.getAll()); @@ -235,7 +235,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(key, val); QueryCursor<Cache.Entry<String, Integer>> qry = - cache.query(new QuerySql(Integer.class, "_key = 'k' and _val > 1")); + cache.query(sql(Integer.class, "_key = 'k' and _val > 1")); Cache.Entry<String, Integer> entry = F.first(qry.getAll()); @@ -253,7 +253,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac // Without alias. final IgniteCache<Object, Object> cache = ignite.jcache(null); - QueryCursor<List<?>> qry = cache.queryFields(new QuerySql("select square(1), square(2)")); + QueryCursor<List<?>> qry = cache.queryFields(sql("select square(1), square(2)")); Collection<List<?>> res = qry.getAll(); @@ -265,7 +265,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac assertEquals(4, row.get(1)); // With alias. - qry = cache.queryFields(new QuerySql("select _cube_(1), _cube_(2)")); + qry = cache.queryFields(sql("select _cube_(1), _cube_(2)")); res = qry.getAll(); @@ -281,7 +281,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac log, new Callable<Object>() { @Override public Object call() throws Exception { - cache.queryFields(new QuerySql("select no()")); + cache.queryFields(sql("select no()")); return null; } @@ -302,7 +302,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac IgniteCache<String, Integer> cache = ignite.jcache(null); - List<Cache.Entry<String, Integer>> qry = cache.query(new QuerySql(Integer.class, "1=1")).getAll(); + List<Cache.Entry<String, Integer>> qry = cache.query(sql(Integer.class, "1=1")).getAll(); Cache.Entry<String, Integer> res = F.first(qry); @@ -324,7 +324,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(1, 1); cache.put(2, 2); - QueryCursor<Cache.Entry<Integer,Integer>> qry = cache.query(new QuerySql(Integer.class, "_key between 2 and 1")); + QueryCursor<Cache.Entry<Integer,Integer>> qry = cache.query(sql(Integer.class, "_key between 2 and 1")); assertTrue(qry.getAll().isEmpty()); } @@ -354,7 +354,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(new Key(100501), val2); QueryCursor<Cache.Entry<Key, GridCacheQueryTestValue>> qry = cache - .query(new QuerySql(GridCacheQueryTestValue.class, + .query(sql(GridCacheQueryTestValue.class, "fieldName='field1' and field2=1 and field3=1 and id=100500 and embeddedField2=11 and x=3")); Cache.Entry<Key, GridCacheQueryTestValue> entry = F.first(qry.getAll()); @@ -409,7 +409,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put("key", "value"); - QueryCursor<Cache.Entry<String, String>> qry = cache.query(new QuerySql(String.class, "true")); + QueryCursor<Cache.Entry<String, String>> qry = cache.query(sql(String.class, "true")); Iterator<Cache.Entry<String, String>> iter = qry.iterator(); @@ -490,7 +490,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac QueryCursor<Cache.Entry<Integer, ObjectValue>> qry = - cache.query(new QuerySql(ObjectValue.class, "intVal >= ? order by intVal").setArgs(0)); + cache.query(sql(ObjectValue.class, "intVal >= ? order by intVal").setArgs(0)); Iterator<Cache.Entry<Integer, ObjectValue>> iter = qry.iterator(); @@ -517,7 +517,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac for (int i = 0; i < cnt; i++) assert set.contains(i); - qry = cache.query(new QuerySql(ObjectValue.class, "MOD(intVal, 2) = ? order by intVal").setArgs(0)); + qry = cache.query(sql(ObjectValue.class, "MOD(intVal, 2) = ? order by intVal").setArgs(0)); iter = qry.iterator(); @@ -706,7 +706,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(1, 1); cache.put(2, 2); - QueryCursor<Cache.Entry<Integer, Integer>> q = cache.query(new QuerySql(Integer.class, "_val > 1")); + QueryCursor<Cache.Entry<Integer, Integer>> q = cache.query(sql(Integer.class, "_val > 1")); Collection<Cache.Entry<Integer, Integer>> res = q.getAll(); @@ -742,7 +742,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac for (int i = 0; i < 50; i++) cache.put(i, i); - QuerySql qry = new QuerySql(Integer.class, "_key >= 0"); + QuerySql qry = sql(Integer.class, "_key >= 0"); qry.setPageSize(10); @@ -785,7 +785,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(i, i); QueryCursor<Cache.Entry<Integer, Integer>> q = - cache.query(new QuerySql(Integer.class, "_key >= 0")); + cache.query(sql(Integer.class, "_key >= 0")); List<Cache.Entry<Integer, Integer>> list = new ArrayList<>(q.getAll()); @@ -851,7 +851,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(key, val); - QueryCursor<Cache.Entry<String, Integer>> qry = cache.query(new QuerySql(Integer.class, + QueryCursor<Cache.Entry<String, Integer>> qry = cache.query(sql(Integer.class, "_key = 'k' and _val > 1")); Cache.Entry<String, Integer> entry = F.first(qry.getAll()); @@ -871,7 +871,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(new BadHashKeyObject("test_key0"), 1005001); cache.put(new BadHashKeyObject("test_key1"), 7); - assertEquals(1005001, cache.query(new QuerySql(Integer.class, "_key = ?").setArgs( + assertEquals(1005001, cache.query(sql(Integer.class, "_key = ?").setArgs( new BadHashKeyObject("test_key0"))).iterator().next().getValue().intValue()); } @@ -909,13 +909,13 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(1, val); - QueryCursor<Cache.Entry<Integer, Object>> q = cache.query(new QuerySql(val.getClass(), "_key >= 0")); + QueryCursor<Cache.Entry<Integer, Object>> q = cache.query(sql(val.getClass(), "_key >= 0")); Collection<Cache.Entry<Integer, Object>> res = q.getAll(); assertEquals(1, res.size()); - List<List<?>> fieldsRes = cache.queryFields(new QuerySql( + List<List<?>> fieldsRes = cache.queryFields(sql( "select field1 from IgniteCacheAbstractQuerySelfTest_5")).getAll(); assertEquals(1, fieldsRes.size()); @@ -947,7 +947,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(1, val1); cache.put(2, val2); - QueryCursor<Cache.Entry<Integer, Object>> q = cache.query(new QuerySql(val1.getClass(), "_key >= 0")); + QueryCursor<Cache.Entry<Integer, Object>> q = cache.query(sql(val1.getClass(), "_key >= 0")); Collection<Cache.Entry<Integer, Object>> res = q.getAll(); @@ -964,7 +964,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(i, i); QueryCursor<Cache.Entry<Integer, Integer>> q = - cache.query(new QuerySql(Integer.class, "_key >= 0")); + cache.query(sql(Integer.class, "_key >= 0")); Collection<Cache.Entry<Integer, Integer>> res = q.getAll(); @@ -994,7 +994,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(i, i); QueryCursor<Cache.Entry<Integer, Integer>> q = - cache.query(new QuerySql(Integer.class, "limit 5")); + cache.query(sql(Integer.class, "limit 5")); Collection<Cache.Entry<Integer, Integer>> res = q.getAll(); @@ -1022,7 +1022,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(2, new ArrayObject(new Long[] {4L, 5L, 6L})); QueryCursor<Cache.Entry<Integer, ArrayObject>> q = - cache.query(new QuerySql(ArrayObject.class, "array_contains(arr, cast(4 as long))")); + cache.query(sql(ArrayObject.class, "array_contains(arr, cast(4 as long))")); Collection<Cache.Entry<Integer, ArrayObject>> res = q.getAll(); @@ -1106,7 +1106,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(i, i); QueryCursor<Cache.Entry<Integer, Integer>> q = - cache.query(new QuerySql(Integer.class, "_key >= ?").setArgs(10)); + cache.query(sql(Integer.class, "_key >= ?").setArgs(10)); if (customSubjId) ((GridCacheQueryAdapter)q).subjectId(subjId); @@ -1374,7 +1374,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cache.put(i, new Person("Person " + i, i)); QueryCursor<List<?>> q = cache - .queryFields(new QuerySql("select _key, name from Person where salary > ?").setArgs(10)); + .queryFields(sql("select _key, name from Person where salary > ?").setArgs(10)); if (customSubjId) ((GridCacheQueryAdapter)q).subjectId(subjId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/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 ee3d281..f76078b 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 @@ -95,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(Query.sql("age >= 0").setType("Person")).iterator(); + cache.query(new QuerySql("age >= 0").setType("Person")).iterator(); int cnt = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/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 cd28de9..7174b84 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 QuerySql( + QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(Query.sql( "update Person set name = ?").setArgs("Mary Poppins")); qry.getAll(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a799c93/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 c632724..2170efa 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 @@ -27,6 +27,7 @@ import javax.cache.Cache; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.cache.query.Query.sql; /** * Tests for partitioned cache queries. @@ -63,7 +64,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer assertEquals(4, cache0.size()); QueryCursor<Cache.Entry<UUID, Person>> qry = - cache0.localQuery(new QuerySql(Person.class, "salary < 2000")); + cache0.localQuery(sql(Person.class, "salary < 2000")); Collection<Cache.Entry<UUID, Person>> entries = qry.getAll(); @@ -96,14 +97,14 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer // Fields query QueryCursor<List<?>> qry = cache0 - .queryFields(new QuerySql("select name from Person where salary > ?").setArgs(1600)); + .queryFields(sql("select name from Person where salary > ?").setArgs(1600)); Collection<List<?>> res = qry.getAll(); assertEquals(3, res.size()); // Fields query count(*) - qry = cache0.queryFields(new QuerySql("select count(*) from Person")); + qry = cache0.queryFields(sql("select count(*) from Person")); res = qry.getAll(); @@ -136,7 +137,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer assert grid(0).nodes().size() == gridCount(); QueryCursor<Cache.Entry<UUID, Person>> qry = - cache0.query(new QuerySql(Person.class, "salary < 2000")); + cache0.query(sql(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/2a799c93/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 d4ddef4..8a200cf 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 QuerySql("select _key from Integer where _key >= 0 order by _key")); + .queryFields(Query.sql("select _key from Integer where _key >= 0 order by _key")); assertEquals(0, q.iterator().next().get(0));
