ignite-sql-tests - fixes after

Merge branch 'ignite-112' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests Conflicts: modules/core/src/main/java/org/apache/ignite/IgniteCache.java modules/core/src/main/java/org/apache/ignite/cache/query/QueryCursor.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java
apache · Feb 5, 2015 · a13dbad · a13dbad
1 parent 00ab785
commit a13dbad
Show file tree

Hide file tree

Showing 16 changed files with 162 additions and 160 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTextPredicate.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTextPredicate.java
@@ -24,25 +24,35 @@
  */
 public final class QueryTextPredicate extends QueryPredicate {
     /** */
-    private Class<?> type;
+    private String type;
 
     /** SQL clause. */
     private String txt;
 
     /**
+     * @param type Type to query.
      * @param txt Search string.
      */
     public QueryTextPredicate(Class<?> type, String txt) {
-        this.type = type;
+        setType(type);
-        this.txt = txt;
+        setText(txt);
+    }
+
+    /**
+     * @param type Type to query.
+     * @param txt Search string.
+     */
+    public QueryTextPredicate(String type, String txt) {
+        setType(type);
+        setText(txt);
     }
 
     /**
      * Gets type for query.
      *
      * @return Type.
      */
-    public Class<?> getType() {
+    public String getType() {
         return type;
     }
 
@@ -52,6 +62,15 @@ public Class<?> getType() {
      * @param type Type.
      */
     public void setType(Class<?> type) {
+        setType(type == null ? null : type.getName());
+    }
+
+    /**
+     * Sets type for query.
+     *
+     * @param type Type.
+     */
+    public void setType(String type) {
         this.type = type;
     }
 

diff --git a/...ava/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java b/...ava/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.query.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -74,7 +74,7 @@ public class IgniteCacheFieldsQueryNoDataSelfTest extends GridCommonAbstractTest
      */
     public void testQuery() throws Exception {
         Collection<Cache.Entry<Object, Object>> res = grid().jcache(null)
-            .query(new QuerySqlPredicate<>("select _VAL from Integer")).getAll();
+            .query(new QuerySqlPredicate("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
@@ -19,8 +19,8 @@
 
 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.internal.processors.cache.query.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 
 import javax.cache.*;
@@ -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 QuerySqlPredicate<Integer, CacheValue>("val >= 5"));
+            cache.query(new QuerySqlPredicate("val >= 5"));
 
         Collection<Cache.Entry<Integer, CacheValue>> queried = qry.getAll();
 

diff --git a/...l/processors/cache/distributed/near/IgniteCachePartitionedQueryMultiThreadedSelfTest.java b/...l/processors/cache/distributed/near/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
@@ -19,13 +19,10 @@
 
 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.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -153,7 +150,7 @@ public void testLuceneAndSqlMultithreaded() throws Exception {
             @Override public void applyx() throws IgniteCheckedException {
                 while (!done.get()) {
                     QueryCursor<Cache.Entry<UUID, Person>> master =
-                        cache0.query(new QueryTextPredicate<UUID, Person>("Master"));
+                        cache0.query(new QueryTextPredicate(Person.class, "Master"));
 
                     Collection<Cache.Entry<UUID, Person>> entries = master.getAll();
 
@@ -174,7 +171,7 @@ public void testLuceneAndSqlMultithreaded() throws Exception {
             @Override public void applyx() throws IgniteCheckedException {
                 while (!done.get()) {
                     QueryCursor<Cache.Entry<UUID, Person>> bachelors =
-                            cache0.query(new QuerySqlPredicate<UUID, Person>("degree = 'Bachelor'"));
+                            cache0.query(new QuerySqlPredicate(Person.class, "degree = 'Bachelor'"));
 
                     Collection<Cache.Entry<UUID, Person>> entries = bachelors.getAll();
 

diff --git a/...st/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/...st/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -21,14 +21,12 @@
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.eviction.fifo.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractQuerySelfTest.*;
+import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractQuerySelfTest.*;
 import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractQuerySelfTest.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.spi.swapspace.noop.*;
-import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractQuerySelfTest.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;

diff --git a/...a/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/...a/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -21,13 +21,14 @@
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.query.annotations.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
@@ -176,7 +177,7 @@ protected CacheAtomicityMode atomicityMode() {
     /** @throws Exception If failed. */
     public void testExecute() throws Exception {
         QueryCursor<List<?>> qry = grid(0).jcache(null)
-            .queryFields(new QuerySqlPredicate<>("select _KEY, name, age from Person"));
+            .queryFields(new QuerySqlPredicate("select _KEY, name, age from Person"));
 
         List<List<?>> res = new ArrayList<>(qry.getAll());
 
@@ -222,7 +223,7 @@ else if (cnt == 1) {
     /** @throws Exception If failed. */
     public void testExecuteWithArguments() throws Exception {
         QueryCursor<List<?>> qry = grid(0).jcache(null)
-            .queryFields(new QuerySqlPredicate<>("select _KEY, name, age from Person where age > ?", 30));
+            .queryFields(new QuerySqlPredicate("select _KEY, name, age from Person where age > ?", 30));
 
         List<List<?>> res = new ArrayList<>(qry.getAll());
 
@@ -263,7 +264,7 @@ else if (cnt == 1) {
     /** @throws Exception If failed. */
     public void testSelectAllJoined() throws Exception {
         QueryCursor<List<?>> qry = grid(0).jcache(null)
-            .queryFields(new QuerySqlPredicate<>("select * from Person p, Organization o where p.orgId = o.id"));
+            .queryFields(new QuerySqlPredicate("select * from Person p, Organization o where p.orgId = o.id"));
 
         List<List<?>> res = new ArrayList<>(qry.getAll());
 
@@ -325,7 +326,7 @@ else if (cnt == 1) {
     /** @throws Exception If failed. */
     public void testEmptyResult() throws Exception {
         QueryCursor<List<?>> qry = grid(0).jcache(null)
-            .queryFields(new QuerySqlPredicate<>("select name from Person where age = 0"));
+            .queryFields(new QuerySqlPredicate("select name from Person where age = 0"));
 
         Collection<List<?>> res = qry.getAll();
 
@@ -335,7 +336,7 @@ public void testEmptyResult() throws Exception {
 
     /** @throws Exception If failed. */
     public void testQueryString() throws Exception {
-        QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(new QuerySqlPredicate<>("select * from String"));
+        QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(new QuerySqlPredicate("select * from String"));
 
         Collection<List<?>> res = qry.getAll();
 
@@ -352,7 +353,7 @@ public void testQueryString() throws Exception {
 
     /** @throws Exception If failed. */
     public void testQueryIntegersWithJoin() throws Exception {
-        QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(new QuerySqlPredicate<>(
+        QueryCursor<List<?>> qry = grid(0).jcache(null).queryFields(new QuerySqlPredicate(
             "select i._KEY, i._VAL, j._KEY, j._VAL from Integer i join Integer j where i._VAL >= 100"));
 
         Collection<List<?>> res = qry.getAll();
@@ -378,7 +379,7 @@ else if (cacheMode() == REPLICATED)
     public void testPagination() throws Exception {
         // Query with page size 20.
         QueryCursor<List<?>> qry = grid(0).jcache(null)
-                .queryFields(new QuerySqlPredicate<>("select * from Integer", 20, new Object[0]));
+                .queryFields(new QuerySqlPredicate("select * from Integer", 20, new Object[0]));
 
         List<List<?>> res = new ArrayList<>(qry.getAll());
 
@@ -403,7 +404,7 @@ public void testNamedCache() throws Exception {
         for (int i = 0; i < 200; i++)
             cache.put(i, i);
 
-        QueryCursor<List<?>> qry = cache.queryFields(new QuerySqlPredicate<Integer, Integer>("select * from Integer"));
+        QueryCursor<List<?>> qry = cache.queryFields(new QuerySqlPredicate("select * from Integer"));
 
         Collection<List<?>> res = qry.getAll();
 
@@ -417,7 +418,7 @@ public void _testNoPrimitives() throws Exception { // TODO
 
         cache.put("key", "val");
 
-        QueryCursor<List<?>> qry = cache.queryFields(new QuerySqlPredicate<>("select * from String"));
+        QueryCursor<List<?>> qry = cache.queryFields(new QuerySqlPredicate("select * from String"));
 
         assert qry.getAll().isEmpty();
 
@@ -435,7 +436,7 @@ public void _testComplexKeys() throws Exception { // TODO
 
         cache.put(key, val);
 
-        Collection<List<?>> res = cache.queryFields(new QuerySqlPredicate<>("select * from Person")).getAll();
+        Collection<List<?>> res = cache.queryFields(new QuerySqlPredicate("select * from Person")).getAll();
 
         assertEquals(1, res.size());
 
@@ -481,7 +482,7 @@ public void testPaginationIteratorNamedCache() throws Exception {
      */
     private void testPaginationIterator(@Nullable String cacheName) throws Exception {
         QueryCursor<List<?>> qry = grid(0).jcache(cacheName)
-            .queryFields(new QuerySqlPredicate<>("select _key, _val from Integer", 10, new Object[0]));
+            .queryFields(new QuerySqlPredicate("select _key, _val from Integer", 10, new Object[0]));
 
         int cnt = 0;
 
@@ -498,10 +499,24 @@ private void testPaginationIterator(@Nullable String cacheName) throws Exception
         assertEquals(size, cnt);
     }
 
+    /**
+     * @param pageSize Page size.
+     * @param sql Query.
+     * @param args Arguments.
+     * @return Predicate.
+     */
+    private QuerySqlPredicate sqlPage(int pageSize, String sql, Object ... args) {
+        QuerySqlPredicate q = new QuerySqlPredicate(sql, args);
+
+        q.setPageSize(pageSize);
+
+        return q;
+    }
+
     /** @throws Exception If failed. */
     public void testPaginationIteratorKeepAll() throws Exception {
         QueryCursor<List<?>> qry = grid(0).jcache(null)
-            .queryFields(new QuerySqlPredicate<>("select _key, _val from Integer", 10, new Object[0]));
+            .queryFields(new QuerySqlPredicate("select _key, _val from Integer", 10, new Object[0]));
 
         int cnt = 0;
 
@@ -517,8 +532,7 @@ public void testPaginationIteratorKeepAll() throws Exception {
 
         assertEquals(size, cnt);
 
-        qry = grid(0).jcache(null)
+        qry = grid(0).jcache(null).queryFields(sqlPage(10, "select _key, _val from Integer"));
-            .queryFields(new QuerySqlPredicate<>("select _key, _val from Integer", 10, new Object[0]));
 
         List<List<?>> list = new ArrayList<>(qry.getAll());
 
@@ -554,7 +568,7 @@ public void testPaginationGetNamedCache() throws Exception {
      */
     private void testPaginationGet(@Nullable String cacheName) throws Exception {
         QueryCursor<List<?>> qry = grid(0).jcache(null)
-            .queryFields(new QuerySqlPredicate<>("select _key, _val from Integer", 10, new Object[0]));
+            .queryFields(new QuerySqlPredicate("select _key, _val from Integer", 10, new Object[0]));
 
         List<List<?>> list = new ArrayList<>(qry.getAll());
 
@@ -577,7 +591,7 @@ private void testPaginationGet(@Nullable String cacheName) throws Exception {
     /** @throws Exception If failed. */
     public void testEmptyGrid() throws Exception {
         QueryCursor<List<?>> qry = grid(0).jcache(null)
-            .queryFields(new QuerySqlPredicate<>("select name, age from Person where age = 25"));
+            .queryFields(new QuerySqlPredicate("select name, age from Person where age = 25"));
 
         List<?> res = F.first(qry.getAll());
 
@@ -623,7 +637,7 @@ private void dedup(Collection<List<?>> res) throws Exception {
     @SuppressWarnings("UnusedDeclaration")
     private static class PersonKey implements Serializable {
         /** ID. */
-        @CacheQuerySqlField
+        @QuerySqlField
         private final UUID id;
 
         /** @param id ID. */
@@ -659,15 +673,15 @@ private PersonKey(UUID id) {
     @SuppressWarnings("UnusedDeclaration")
     private static class Person implements Serializable {
         /** Name. */
-        @CacheQuerySqlField(index = false)
+        @QuerySqlField(index = false)
         private final String name;
 
         /** Age. */
-        @CacheQuerySqlField(index = true)
+        @QuerySqlField(index = true)
         private final int age;
 
         /** Organization ID. */
-        @CacheQuerySqlField(index = true)
+        @QuerySqlField(index = true)
         private final int orgId;
 
         /**
@@ -716,11 +730,11 @@ private Person(String name, int age, int orgId) {
     @SuppressWarnings("UnusedDeclaration")
     private static class Organization implements Serializable {
         /** ID. */
-        @CacheQuerySqlField
+        @QuerySqlField
         private final int id;
 
         /** Name. */
-        @CacheQuerySqlField(index = false)
+        @QuerySqlField(index = false)
         private final String name;
 
         /**