ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [07/50] incubator-ignite git commit: # ignite-738
Date Thu, 16 Apr 2015 09:49:25 GMT
# ignite-738


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e16701d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e16701d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e16701d4

Branch: refs/heads/ignite-424
Commit: e16701d4e5fee6739a94658cb4b813e3976190f1
Parents: 0920bcf
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Apr 14 11:34:53 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Apr 14 11:43:59 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/query/CacheQueries.java     |  2 +-
 .../internal/processors/cache/query/CacheQueriesImpl.java |  8 --------
 .../processors/cache/query/GridCacheQueryAdapter.java     |  3 ++-
 .../processors/cache/IgniteTxMultiNodeAbstractTest.java   |  4 +---
 .../GridCacheReplicatedPreloadLifecycleSelfTest.java      | 10 ++++------
 .../cache/GridCacheCrossCacheQuerySelfTest.java           |  4 ++--
 .../GridCacheReduceFieldsQueryPartitionedSelfTest.java    |  5 -----
 7 files changed, 10 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e16701d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
index 3d0460e..d475a97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 /**
- * Extended queries interface.
+ * Internal queries interface.
  */
 public interface CacheQueries<K, V> {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e16701d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
index 7abd97d..10bc4b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java
@@ -25,7 +25,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.spi.indexing.*;
 import org.jetbrains.annotations.*;
 
-import java.io.*;
 import java.util.*;
 
 import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*;
@@ -44,13 +43,6 @@ public class CacheQueriesImpl<K, V> implements CacheQueries<K,
V> {
     private GridCacheProjectionImpl<K, V> prj;
 
     /**
-     * Required by {@link Externalizable}.
-     */
-    public CacheQueriesImpl() {
-        // No-op.
-    }
-
-    /**
      * @param ctx Context.
      * @param prj Projection.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e16701d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index fa54bbc..07a68bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -401,11 +401,12 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T>
{
             return (CacheQueryFuture<T>)(loc ? qryMgr.queryLocal(bean) : qryMgr.queryDistributed(bean,
nodes));
     }
 
-
+    /** {@inheritDoc} */
     @Override public QueryMetrics metrics() {
         return metrics.copy();
     }
 
+    /** {@inheritDoc} */
     @Override public void resetMetrics() {
         metrics = new GridCacheQueryMetricsAdapter();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e16701d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
index 58c07a0..3e9788e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
@@ -292,7 +292,6 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             }
 
             while (true) {
-
                 SqlQuery<String, Integer> qry =
                     new SqlQuery<>(Integer.class, "_key != 'RMVD_CNTR_KEY' and _val
>= 0");
 
@@ -723,8 +722,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
 
             SqlQuery<String, Integer> qry = new SqlQuery<>(Integer.class, "_val
>= 0");
 
-            List<Cache.Entry<String, Integer>> entries =
-                new ArrayList<>(cache.query(qry).getAll());
+            List<Cache.Entry<String, Integer>> entries = new ArrayList<>(cache.query(qry).getAll());
 
             Collections.sort(entries, new Comparator<Cache.Entry<String, Integer>>()
{
                 @Override public int compare(Cache.Entry<String, Integer> o1, Cache.Entry<String,
Integer> o2) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e16701d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index 525a8f7..d24973a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@ -190,8 +190,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
                 int totalCnt = F.reduce(qry.execute().get(), new IgniteReducer<Map.Entry<Object,
MyValue>, Integer>() {
                     private int cnt;
 
-                    @Override
-                    public boolean collect(Map.Entry<Object, MyValue> e) {
+                    @Override public boolean collect(Map.Entry<Object, MyValue> e)
{
                         if (!quiet && grid.log().isInfoEnabled())
                             grid.log().info("Collecting entry: " + e);
 
@@ -201,10 +200,10 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
 
                         try {
                             Object v1 = e.getValue();
-                            Object v2 = ((IgniteKernal) grid).getCache("one").get(key);
+                            Object v2 = ((IgniteKernal)grid).getCache("one").get(key);
 
                             assertNotNull("Cache c1 misses value for key [i=" + j0 + ", j="
+ i0 +
-                                ", missedKey=" + key + ", cache=" + ((IgniteKernal) grid).getCache("one").values()
+ ']', v2);
+                                ", missedKey=" + key + ", cache=" + ((IgniteKernal)grid).getCache("one").values()
+ ']', v2);
                             assertEquals(v1, v2);
                         }
                         catch (IgniteCheckedException e1) {
@@ -218,8 +217,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
                         return true;
                     }
 
-                    @Override
-                    public Integer reduce() {
+                    @Override public Integer reduce() {
                         return cnt;
                     }
                 });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e16701d4/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index ec3b1e9..e870531 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -127,9 +127,9 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest
{
 
         q.addMapQuery("_cnts_", "select count(*) x from \"partitioned\".FactPurchase where
? = ?", 2, 2);
 
-        //Object cnt = qx.execute(cache, q).getAll().iterator().next().get(0);
+        Object cnt = qx.execute(cache, q).getAll().iterator().next().get(0);
 
-        //assertEquals(10L, cnt);
+        assertEquals(10L, cnt);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e16701d4/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
index de5093f..19538a1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
@@ -18,11 +18,6 @@
 package org.apache.ignite.internal.processors.cache.reducefields;
 
 import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
 


Mime
View raw message