ignite-sql-tests - renaming

apache · Feb 8, 2015 · c4ed31f · c4ed31f
1 parent 2a799c9
commit c4ed31f
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 91 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -199,10 +199,10 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
      *
      * @param qry Query.
      * @return Cursor.
-     * @see QueryScan
+     * @see ScanQuery
-     * @see QuerySql
+     * @see SqlQuery
-     * @see QueryText
+     * @see TextQuery
-     * @see QuerySpi
+     * @see SpiQuery
      */
     public QueryCursor<Entry<K, V>> query(Query qry);
 
@@ -219,10 +219,10 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
      *
      * @param qry Query.
      * @return Cursor.
-     * @see QueryScan
+     * @see ScanQuery
-     * @see QuerySql
+     * @see SqlQuery
-     * @see QueryText
+     * @see TextQuery
-     * @see QuerySpi
+     * @see SpiQuery
      */
     public QueryCursor<Entry<K, V>> localQuery(Query qry);
 

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
@@ -27,8 +27,12 @@
 
 /**
  * Base class for all Ignite cache queries.
- * Use {@link QuerySql} and {@link QueryText} for SQL and
+ * Use {@link SqlQuery} and {@link TextQuery} for SQL and
  * text queries accordingly.
+ * <p>
+ * Also contains convenience shortcuts for query object construction:
+ * {@link #sql(Class, String)}, {@link #sql(String)}, {@link #text(Class, String)},
+ * {@link #scan(IgniteBiPredicate)} and {@link #spi()}.
  *
  * @see IgniteCache#query(Query)
  * @see IgniteCache#localQuery(Query)
@@ -63,8 +67,8 @@ public static SqlFieldsQuery sql(String sql) {
      * @param sql SQL Query string.
      * @return SQL Query instance.
      */
-    public static QuerySql sql(Class<?> type, String sql) {
+    public static SqlQuery sql(Class<?> type, String sql) {
-        return new QuerySql(type, sql);
+        return new SqlQuery(type, sql);
     }
 
     /**
@@ -74,8 +78,8 @@ public static QuerySql sql(Class<?> type, String sql) {
      * @param txt Search string.
      * @return Fulltext query.
      */
-    public static QueryText text(Class<?> type, String txt) {
+    public static TextQuery text(Class<?> type, String txt) {
-        return new QueryText(txt).setType(type);
+        return new TextQuery(txt).setType(type);
     }
 
     /**
@@ -84,8 +88,8 @@ public static QueryText text(Class<?> type, String txt) {
      * @param filter Filter.
      * @return SPI Query.
      */
-    public static <K, V> QueryScan<K, V> scan(final IgniteBiPredicate<K, V> filter) {
+    public static <K, V> ScanQuery<K, V> scan(final IgniteBiPredicate<K, V> filter) {
-        return new QueryScan<>(filter);
+        return new ScanQuery<>(filter);
     }
 
     /**
@@ -94,8 +98,8 @@ public static <K, V> QueryScan<K, V> scan(final IgniteBiPredicate<K, V> filter)
      * @return SPI Query.
      * @see IndexingSpi
      */
-    public static QuerySpi spi() {
+    public static SpiQuery spi() {
-        return new QuerySpi();
+        return new SpiQuery();
     }
 
     /**

diff --git a/.../apache/ignite/cache/query/QueryScan.java → .../apache/ignite/cache/query/ScanQuery.java b/.../apache/ignite/cache/query/QueryScan.java → .../apache/ignite/cache/query/ScanQuery.java
@@ -28,14 +28,14 @@
  * @see IgniteCache#query(Query)
  * @see IgniteCache#localQuery(Query)
  */
-public class QueryScan<K, V> extends Query<QueryScan<K, V>> {
+public class ScanQuery<K, V> extends Query<ScanQuery<K, V>> {
     /** */
     private IgniteBiPredicate<K,V> filter;
 
     /**
      * Create scan query returning all entries.
      */
-    public QueryScan() {
+    public ScanQuery() {
         this(null);
     }
 
@@ -44,7 +44,7 @@ public QueryScan() {
      *
      * @param filter Filter. If {@code null} then all entries will be returned.
      */
-    public QueryScan(@Nullable IgniteBiPredicate<K,V> filter) {
+    public ScanQuery(@Nullable IgniteBiPredicate<K,V> filter) {
         setFilter(filter);
     }
 
@@ -68,6 +68,6 @@ public void setFilter(@Nullable IgniteBiPredicate<K,V> filter) {
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(QueryScan.class, this);
+        return S.toString(ScanQuery.class, this);
     }
 }
diff --git a/...g/apache/ignite/cache/query/QuerySpi.java → ...g/apache/ignite/cache/query/SpiQuery.java b/...g/apache/ignite/cache/query/QuerySpi.java → ...g/apache/ignite/cache/query/SpiQuery.java
@@ -28,7 +28,7 @@
  * @see IgniteCache#query(Query)
  * @see IgniteCache#localQuery(Query)
  */
-public final class QuerySpi extends Query<QuerySpi> {
+public final class SpiQuery extends Query<SpiQuery> {
     /** Arguments. */
     @GridToStringInclude
     private Object[] args;
@@ -48,14 +48,14 @@ public Object[] getArgs() {
      * @param args SQL arguments.
      * @return {@code this} For chaining.
      */
-    public QuerySpi setArgs(Object... args) {
+    public SpiQuery setArgs(Object... args) {
         this.args = args;
 
         return this;
     }
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(QuerySpi.class, this);
+        return S.toString(SpiQuery.class, this);
     }
 }
diff --git a/...g/apache/ignite/cache/query/QuerySql.java → ...g/apache/ignite/cache/query/SqlQuery.java b/...g/apache/ignite/cache/query/QuerySql.java → ...g/apache/ignite/cache/query/SqlQuery.java
@@ -28,7 +28,7 @@
  * @see IgniteCache#query(Query)
  * @see IgniteCache#localQuery(Query)
  */
-public final class QuerySql extends Query<QuerySql> {
+public final class SqlQuery extends Query<SqlQuery> {
     /** */
     private String type;
 
@@ -44,7 +44,7 @@ public final class QuerySql extends Query<QuerySql> {
      *
      * @param sql SQL Query.
      */
-    public QuerySql(String sql) {
+    public SqlQuery(String sql) {
         setSql(sql);
     }
 
@@ -54,7 +54,7 @@ public QuerySql(String sql) {
      * @param type Type.
      * @param sql SQL Query.
      */
-    public QuerySql(Class<?> type, String sql) {
+    public SqlQuery(Class<?> type, String sql) {
         this(sql);
 
         setType(type);
@@ -75,7 +75,7 @@ public String getSql() {
      * @param sql SQL clause.
      * @return {@code this} For chaining.
      */
-    public QuerySql setSql(String sql) {
+    public SqlQuery setSql(String sql) {
         A.notNull(sql, "sql");
 
         this.sql = sql;
@@ -98,7 +98,7 @@ public Object[] getArgs() {
      * @param args SQL arguments.
      * @return {@code this} For chaining.
      */
-    public QuerySql setArgs(Object... args) {
+    public SqlQuery setArgs(Object... args) {
         this.args = args;
 
         return this;
@@ -119,7 +119,7 @@ public String getType() {
      * @param type Type.
      * @return {@code this} For chaining.
      */
-    public QuerySql setType(String type) {
+    public SqlQuery setType(String type) {
         this.type = type;
 
         return this;
@@ -128,12 +128,12 @@ public QuerySql setType(String type) {
     /**
      * @param type Type.
      */
-    public QuerySql setType(Class<?> type) {
+    public SqlQuery setType(Class<?> type) {
         return setType(GridQueryProcessor.typeName(type));
     }
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(QuerySql.class, this);
+        return S.toString(SqlQuery.class, this);
     }
 }
diff --git a/.../apache/ignite/cache/query/QueryText.java → .../apache/ignite/cache/query/TextQuery.java b/.../apache/ignite/cache/query/QueryText.java → .../apache/ignite/cache/query/TextQuery.java
@@ -27,7 +27,7 @@
  * @see IgniteCache#query(Query)
  * @see IgniteCache#localQuery(Query)
  */
-public final class QueryText extends Query<QueryText> {
+public final class TextQuery extends Query<TextQuery> {
     /** */
     private String type;
 
@@ -39,7 +39,7 @@ public final class QueryText extends Query<QueryText> {
      *
      * @param txt Search string.
      */
-    public QueryText(String txt) {
+    public TextQuery(String txt) {
         setText(txt);
     }
 
@@ -49,7 +49,7 @@ public QueryText(String txt) {
      * @param type Type.
      * @param txt Search string.
      */
-    public QueryText(Class<?> type, String txt) {
+    public TextQuery(Class<?> type, String txt) {
         this(txt);
 
         setType(type);
@@ -70,7 +70,7 @@ public String getType() {
      * @param type Type.
      * @return {@code this} For chaining.
      */
-    public QueryText setType(Class<?> type) {
+    public TextQuery setType(Class<?> type) {
         return setType(GridQueryProcessor.typeName(type));
     }
 
@@ -80,7 +80,7 @@ public QueryText setType(Class<?> type) {
      * @param type Type.
      * @return {@code this} For chaining.
      */
-    public QueryText setType(String type) {
+    public TextQuery setType(String type) {
         this.type = type;
 
         return this;
@@ -101,7 +101,7 @@ public String getText() {
      * @param txt Text search string.
      * @return {@code this} For chaining.
      */
-    public QueryText setText(String txt) {
+    public TextQuery setText(String txt) {
         A.notNull(txt, "txt");
 
         this.txt = txt;
@@ -111,6 +111,6 @@ public QueryText setText(String txt) {
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(QueryText.class, this);
+        return S.toString(TextQuery.class, this);
     }
 }
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
@@ -260,8 +260,8 @@ private QueryCursor<Entry<K,V>> query(Query filter, @Nullable ClusterGroup grp)
         final CacheQuery<Map.Entry<K,V>> qry;
         final CacheQueryFuture<Map.Entry<K,V>> fut;
 
-        if (filter instanceof QueryScan) {
+        if (filter instanceof ScanQuery) {
-            IgniteBiPredicate<K,V> p = ((QueryScan)filter).getFilter();
+            IgniteBiPredicate<K,V> p = ((ScanQuery)filter).getFilter();
 
             qry = delegate.queries().createScanQuery(p != null ? p : ACCEPT_ALL);
 
@@ -270,8 +270,8 @@ private QueryCursor<Entry<K,V>> query(Query filter, @Nullable ClusterGroup grp)
 
             fut = qry.execute();
         }
-        else if (filter instanceof QueryText) {
+        else if (filter instanceof TextQuery) {
-            QueryText p = (QueryText)filter;
+            TextQuery p = (TextQuery)filter;
 
             qry = delegate.queries().createFullTextQuery(p.getType(), p.getText());
 
@@ -280,13 +280,13 @@ else if (filter instanceof QueryText) {
 
             fut = qry.execute();
         }
-        else if (filter instanceof QuerySpi) {
+        else if (filter instanceof SpiQuery) {
             qry = ((GridCacheQueriesEx)delegate.queries()).createSpiQuery();
 
             if (grp != null)
                 qry.projection(grp);
 
-            fut = qry.execute(((QuerySpi)filter).getArgs());
+            fut = qry.execute(((SpiQuery)filter).getArgs());
         }
         else
             throw new IgniteException("Unsupported query predicate: " + filter);
@@ -323,8 +323,8 @@ else if (filter instanceof QuerySpi) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            if (filter instanceof QuerySql) {
+            if (filter instanceof SqlQuery) {
-                QuerySql p = (QuerySql)filter;
+                SqlQuery p = (SqlQuery)filter;
 
                 return ctx.kernalContext().query().queryTwoStep(ctx.name(), p.getType(), p.getSql(), p.getArgs());
             }
@@ -369,8 +369,8 @@ else if (filter instanceof QuerySpi) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            if (filter instanceof QuerySql) {
+            if (filter instanceof SqlQuery) {
-                QuerySql p = (QuerySql)filter;
+                SqlQuery p = (SqlQuery)filter;
 
                 return new QueryCursorImpl<>(ctx.kernalContext().query().<K,V>queryLocal(
                     ctx.name(), p.getType(), p.getSql(), p.getArgs()));

diff --git a/...ava/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java b/...ava/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
@@ -73,7 +73,7 @@ public class IgniteCacheFieldsQueryNoDataSelfTest extends GridCommonAbstractTest
      */
     public void testQuery() throws Exception {
         Collection<Cache.Entry<Object, Object>> res = grid().jcache(null)
-            .query(new QuerySql("select _VAL from Integer")).getAll();
+            .query(new SqlQuery("select _VAL from Integer")).getAll();
 
         assert res != null;
         assert res.isEmpty();

diff --git a/.../test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java b/.../test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java
@@ -98,7 +98,7 @@ private void checkCache(IgniteCache<Integer, CacheValue> cache) throws Exception
      */
     private void checkQuery(IgniteCache<Integer, CacheValue> cache) throws Exception {
         QueryCursor<Cache.Entry<Integer, CacheValue>> qry =
-            cache.query(new QuerySql("val >= 5"));
+            cache.query(new SqlQuery("val >= 5"));
 
         Collection<Cache.Entry<Integer, CacheValue>> queried = qry.getAll();