ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [15/23] incubator-ignite git commit: # ignite-611
Date Tue, 31 Mar 2015 09:47:49 GMT
# ignite-611


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

Branch: refs/heads/ignite-sprint-3
Commit: d61edf129e6ae781bb5a856652b25b8864905dc2
Parents: 684db52
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Mar 27 15:16:13 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Mar 27 15:16:13 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/IgniteEx.java |  4 +---
 .../java/org/apache/ignite/internal/IgniteKernal.java  |  5 ++---
 .../internal/processors/cache/GridCacheProcessor.java  | 13 -------------
 .../service/GridServiceReassignmentSelfTest.java       |  5 +++--
 4 files changed, 6 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d61edf12/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index b53633b..b8c1e11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -34,11 +34,9 @@ public interface IgniteEx extends Ignite {
     /**
      * Gets utility cache.
      *
-     * @param keyCls Key class.
-     * @param valCls Value class.
      * @return Utility cache.
      */
-    public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K, V> utilityCache(Class<K>
keyCls, Class<V> valCls);
+    public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K, V> utilityCache();
 
     /**
      * Gets the cache instance for the given name if one is configured or

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d61edf12/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index c9c3b8d..6c5a0be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2417,12 +2417,11 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
     }
 
     /** {@inheritDoc} */
-    @Override public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K,
V> utilityCache(Class<K> keyCls,
-        Class<V> valCls) {
+    @Override public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K,
V> utilityCache() {
         guard();
 
         try {
-            return ctx.cache().utilityCache(keyCls, valCls);
+            return ctx.cache().utilityCache();
         }
         finally {
             unguard();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d61edf12/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 24a9886..3d21cd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -2197,19 +2197,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     /**
      * Gets utility cache.
      *
-     * @param keyCls Key class.
-     * @param valCls Value class.
-     * @return Projection over utility cache.
-     */
-    public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K, V> utilityCache(Class<K>
keyCls, Class<V> valCls) {
-        GridCache<K, V> cache = cache(CU.UTILITY_CACHE_NAME);
-
-        return (GridCacheProjectionEx<K, V>)cache;
-    }
-
-    /**
-     * Gets utility cache.
-     *
      * @return Utility cache.
      */
     public <K, V> GridCacheAdapter<K, V> utilityCache() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d61edf12/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
index 61dbe9e..4448153 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
@@ -145,13 +145,14 @@ public class GridServiceReassignmentSelfTest extends GridServiceProcessorAbstrac
      * @param total Total number of services.
      * @param maxPerNode Maximum number of services per node.
      * @param gridIdx Grid index to check.
+     * @param lastTry Last try flag.
      * @throws Exception If failed.
+     * @return {@code True} if check passed.
      */
     private boolean checkServices(int total, int maxPerNode, int gridIdx, boolean lastTry)
throws Exception {
         IgniteEx grid = grid(gridIdx);
 
-        GridCacheProjectionEx<GridServiceAssignmentsKey, GridServiceAssignments> cache
= grid.
-            utilityCache(GridServiceAssignmentsKey.class, GridServiceAssignments.class);
+        GridCacheProjectionEx<GridServiceAssignmentsKey, GridServiceAssignments> cache
= grid.utilityCache();
 
         GridServiceAssignments assignments = cache.get(new GridServiceAssignmentsKey("testService"));
 


Mime
View raw message