ignite-sql-tests - rename

modules/core/src/main/java/org/apache/ignite/IgniteCache.java

@@ -195,36 +195,44 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
     public boolean isLocalLocked(K key, boolean byCurrThread);
 
     /**
-     * Queries cache with given predicate.
+     * Queries cache. Accepts any subclass of {@link Query}.
      *
-     * @param filter Filter.
+     * @param qry Query.
      * @return Cursor.
+     * @see QueryScan
+     * @see QuerySql
+     * @see QueryText
+     * @see QuerySpi
      */
-    public QueryCursor<Entry<K, V>> query(QueryPredicate filter);
+    public QueryCursor<Entry<K, V>> query(Query qry);
 
     /**
-     * Queries separate entry fields with given SQL predicate.
+     * Queries separate entry fields.
      *
-     * @param filter SQL Filter.
+     * @param qry SQL Query.
      * @return Cursor.
      */
-    public QueryCursor<List<?>> queryFields(QuerySqlPredicate filter);
+    public QueryCursor<List<?>> queryFields(QuerySql qry);
 
     /**
-     * Queries cache with given predicate only locally.
+     * Queries cache locally. Accepts any subclass of {@link Query}.
      *
-     * @param filter Filter.
+     * @param qry Query.
      * @return Cursor.
+     * @see QueryScan
+     * @see QuerySql
+     * @see QueryText
+     * @see QuerySpi
      */
-    public QueryCursor<Entry<K, V>> localQuery(QueryPredicate filter);
+    public QueryCursor<Entry<K, V>> localQuery(Query qry);
 
     /**
-     * Queries separate entry fields with given SQL predicate only locally.
+     * Queries separate entry fields locally.
      *
-     * @param filter Filter.
+     * @param qry SQL Query.
      * @return Cursor.
      */
-    public QueryCursor<List<?>> localQueryFields(QuerySqlPredicate filter);
+    public QueryCursor<List<?>> localQueryFields(QuerySql qry);
 
     /**
      * Allows for iteration over local cache entries.

modules/core/src/main/java/org/apache/ignite/cache/query/QueryPredicate.java → modules/core/src/main/java/org/apache/ignite/cache/query/Query.java

@@ -26,17 +26,17 @@
 
 /**
  * Query to pass into any of {@code Cache.query(...)} methods.
- * Use {@link QuerySqlPredicate} and {@link QueryTextPredicate} for SQL and
+ * Use {@link QuerySql} and {@link QueryText} for SQL and
  * text queries accordingly.
  */
-public abstract class QueryPredicate<T extends QueryPredicate> implements Serializable {
+public abstract class Query<T extends Query> implements Serializable {
     /** Page size. */
     private int pageSize;
 
     /**
      * Empty constructor.
      */
-    protected QueryPredicate() {
+    Query() {
         // No-op.
     }
 
@@ -46,8 +46,8 @@ protected QueryPredicate() {
      * @param sql SQL Query string.
      * @return SQL Query instance.
      */
-    public static QuerySqlPredicate sql(String sql) {
-        return new QuerySqlPredicate(sql);
+    public static QuerySql sql(String sql) {
+        return new QuerySql(sql);
     }
 
     /**
@@ -57,7 +57,7 @@ public static QuerySqlPredicate sql(String sql) {
      * @param sql SQL Query string.
      * @return SQL Query instance.
      */
-    public static QuerySqlPredicate sql(Class<?> type, String sql) {
+    public static QuerySql sql(Class<?> type, String sql) {
         return sql(sql).setType(type);
     }
 
@@ -67,8 +67,8 @@ public static QuerySqlPredicate sql(Class<?> type, String sql) {
      * @param txt Search string.
      * @return Fulltext query.
      */
-    public static QueryTextPredicate text(String txt) {
-        return new QueryTextPredicate(txt);
+    public static QueryText text(String txt) {
+        return new QueryText(txt);
     }
 
     /**
@@ -78,7 +78,7 @@ public static QueryTextPredicate text(String txt) {
      * @param txt Search string.
      * @return Fulltext query.
      */
-    public static QueryTextPredicate text(Class<?> type, String txt) {
+    public static QueryText text(Class<?> type, String txt) {
         return text(txt).setType(type);
     }
 
@@ -88,17 +88,17 @@ public static QueryTextPredicate text(Class<?> type, String txt) {
      * @param filter Filter.
      * @return SPI Query.
      */
-    public static <K, V> QueryScanPredicate<K, V> scan(final IgniteBiPredicate<K, V> filter) {
-        return new QueryScanPredicate<>(filter);
+    public static <K, V> QueryScan<K, V> scan(final IgniteBiPredicate<K, V> filter) {
+        return new QueryScan<>(filter);
     }
 
     /**
      * Factory method for SPI queries returning all entries.
      *
      * @return SPI Query.
      */
-    public static <K, V> QueryScanPredicate<K, V> scan() {
-        return new QueryScanPredicate<>();
+    public static <K, V> QueryScan<K, V> scan() {
+        return new QueryScan<>();
     }
 
     /**
@@ -107,8 +107,8 @@ public static <K, V> QueryScanPredicate<K, V> scan() {
      * @return SPI Query.
      * @see IndexingSpi
      */
-    public static QuerySpiPredicate spi() {
-        return new QuerySpiPredicate();
+    public static QuerySpi spi() {
+        return new QuerySpi();
     }
 
     /**
@@ -135,6 +135,6 @@ public T setPageSize(int pageSize) {
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(QueryPredicate.class, this);
+        return S.toString(Query.class, this);
     }
 }

modules/core/src/main/java/org/apache/ignite/cache/query/QueryContinuousPredicate.java → modules/core/src/main/java/org/apache/ignite/cache/query/QueryContinuous.java

@@ -106,7 +106,7 @@
  * If you need to repeat execution, use {@link org.apache.ignite.internal.processors.cache.query.CacheQueries#createContinuousQuery()} method to create
  * new query.
  */
-public final class QueryContinuousPredicate<K, V> extends QueryPredicate implements AutoCloseable {
+public final class QueryContinuous<K, V> extends Query implements AutoCloseable {
     /**
      * Default buffer size. Size of {@code 1} means that all entries
      * will be sent to master node immediately (buffering is disabled).
@@ -122,7 +122,7 @@ public final class QueryContinuousPredicate<K, V> extends QueryPredicate impleme
      */
     public static final boolean DFLT_AUTO_UNSUBSCRIBE = true;
 
-    public void setInitialPredicate(QueryPredicate filter) {
+    public void setInitialPredicate(Query filter) {
         // TODO: implement.
     }
 

modules/core/src/main/java/org/apache/ignite/cache/query/QueryScanPredicate.java → modules/core/src/main/java/org/apache/ignite/cache/query/QueryScan.java

@@ -21,16 +21,16 @@
 import org.apache.ignite.lang.*;
 
 /**
- * Scan query over cache entries. By default will accept all the entries.
+ * Scan query over cache entries. Will accept all the entries if no predicate was set.
  */
-public class QueryScanPredicate<K, V> extends QueryPredicate<QueryScanPredicate<K, V>> {
+public class QueryScan<K, V> extends Query<QueryScan<K, V>> {
     /** */
     private IgniteBiPredicate<K,V> filter;
 
     /**
      * Create scan query returning all entries.
      */
-    public QueryScanPredicate() {
+    public QueryScan() {
         this(new IgniteBiPredicate<K,V>() {
             @Override public boolean apply(K k, V v) {
                 return true;
@@ -43,7 +43,7 @@ public QueryScanPredicate() {
      *
      * @param filter Filter.
      */
-    public QueryScanPredicate(IgniteBiPredicate<K,V> filter) {
+    public QueryScan(IgniteBiPredicate<K,V> filter) {
         setFilter(filter);
     }
 

modules/core/src/main/java/org/apache/ignite/cache/query/QuerySpiPredicate.java → modules/core/src/main/java/org/apache/ignite/cache/query/QuerySpi.java

@@ -22,7 +22,7 @@
 /**
  * Query to be used by {@link IndexingSpi} implementations.
  */
-public final class QuerySpiPredicate extends QueryPredicate<QuerySpiPredicate> {
+public final class QuerySpi extends Query<QuerySpi> {
     /** Arguments. */
     private Object[] args;
 
@@ -41,7 +41,7 @@ public Object[] getArgs() {
      * @param args SQL arguments.
      * @return {@code this} For chaining.
      */
-    public QuerySpiPredicate setArgs(Object... args) {
+    public QuerySpi setArgs(Object... args) {
         this.args = args;
 
         return this;

modules/core/src/main/java/org/apache/ignite/cache/query/QuerySqlPredicate.java → modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java

@@ -21,10 +21,10 @@
 import org.apache.ignite.internal.util.typedef.internal.*;
 
 /**
- * Query SQL predicate to use with any of the {@code JCache.query(...)} and
+ * SQL Query to use with any of the {@code JCache.query(...)} and
  * {@code JCache.queryFields(...)} methods.
  */
-public final class QuerySqlPredicate extends QueryPredicate<QuerySqlPredicate> {
+public final class QuerySql extends Query<QuerySql> {
     /** */
     private String type;
 
@@ -40,7 +40,7 @@ public final class QuerySqlPredicate extends QueryPredicate<QuerySqlPredicate> {
      *
      * @param sql SQL Query.
      */
-    public QuerySqlPredicate(String sql) {
+    public QuerySql(String sql) {
         setSql(sql);
     }
 
@@ -50,7 +50,7 @@ public QuerySqlPredicate(String sql) {
      * @param type Type.
      * @param sql SQL Query.
      */
-    public QuerySqlPredicate(Class<?> type, String sql) {
+    public QuerySql(Class<?> type, String sql) {
         this(sql);
 
         setType(type);
@@ -71,7 +71,7 @@ public String getSql() {
      * @param sql SQL clause.
      * @return {@code this} For chaining.
      */
-    public QuerySqlPredicate setSql(String sql) {
+    public QuerySql setSql(String sql) {
         A.notNull(sql, "sql");
 
         this.sql = sql;
@@ -94,7 +94,7 @@ public Object[] getArgs() {
      * @param args SQL arguments.
      * @return {@code this} For chaining.
      */
-    public QuerySqlPredicate setArgs(Object... args) {
+    public QuerySql setArgs(Object... args) {
         this.args = args;
 
         return this;
@@ -115,7 +115,7 @@ public String getType() {
      * @param type Type.
      * @return {@code this} For chaining.
      */
-    public QuerySqlPredicate setType(String type) {
+    public QuerySql setType(String type) {
         this.type = type;
 
         return this;
@@ -124,7 +124,7 @@ public QuerySqlPredicate setType(String type) {
     /**
      * @param type Type.
      */
-    public QuerySqlPredicate setType(Class<?> type) {
+    public QuerySql setType(Class<?> type) {
         return setType(name(type));
     }
 
@@ -145,6 +145,6 @@ static String name(Class<?> type) {
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(QuerySqlPredicate.class, this);
+        return S.toString(QuerySql.class, this);
     }
 }

modules/core/src/main/java/org/apache/ignite/cache/query/QueryTextPredicate.java → modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java

@@ -19,12 +19,12 @@
 
 import org.apache.ignite.internal.util.typedef.internal.*;
 
-import static org.apache.ignite.cache.query.QuerySqlPredicate.name;
+import static org.apache.ignite.cache.query.QuerySql.*;
 
 /**
- * Predicate for Lucene based fulltext search.
+ * Query for Lucene based fulltext search.
  */
-public final class QueryTextPredicate extends QueryPredicate<QueryTextPredicate> {
+public final class QueryText extends Query<QueryText> {
     /** */
     private String type;
 
@@ -36,7 +36,7 @@ public final class QueryTextPredicate extends QueryPredicate<QueryTextPredicate>
      *
      * @param txt Search string.
      */
-    public QueryTextPredicate(String txt) {
+    public QueryText(String txt) {
         setText(txt);
     }
 
@@ -46,7 +46,7 @@ public QueryTextPredicate(String txt) {
      * @param type Type.
      * @param txt Search string.
      */
-    public QueryTextPredicate(Class<?> type, String txt) {
+    public QueryText(Class<?> type, String txt) {
         this(txt);
 
         setType(type);
@@ -67,7 +67,7 @@ public String getType() {
      * @param type Type.
      * @return {@code this} For chaining.
      */
-    public QueryTextPredicate setType(Class<?> type) {
+    public QueryText setType(Class<?> type) {
         return setType(name(type));
     }
 
@@ -77,7 +77,7 @@ public QueryTextPredicate setType(Class<?> type) {
      * @param type Type.
      * @return {@code this} For chaining.
      */
-    public QueryTextPredicate setType(String type) {
+    public QueryText setType(String type) {
         this.type = type;
 
         return this;
@@ -98,7 +98,7 @@ public String getText() {
      * @param txt Text search string.
      * @return {@code this} For chaining.
      */
-    public QueryTextPredicate setText(String txt) {
+    public QueryText setText(String txt) {
         A.notNull(txt, "txt");
 
         this.txt = txt;
@@ -108,6 +108,6 @@ public QueryTextPredicate setText(String txt) {
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(QueryTextPredicate.class, this);
+        return S.toString(QueryText.class, this);
     }
 }