ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [28/28] ignite git commit: IGNITE-2508: Further fixes.
Date Wed, 03 Feb 2016 12:28:23 GMT
IGNITE-2508: Further fixes.


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

Branch: refs/heads/ignite-2508
Commit: dbb014c8eb56bc682aeafd7deeb099d5d398a9f2
Parents: 566598e
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Feb 3 15:27:16 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Feb 3 15:27:16 2016 +0300

----------------------------------------------------------------------
 .../affinity/GridAffinityAssignmentCache.java   |  1 -
 .../cache/GridCacheAffinityManager.java         | 36 ++++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/dbb014c8/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 0bc503c..26e4d98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.affinity;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/ignite/blob/dbb014c8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index e3a5439..21975da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -156,24 +156,6 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter
{
     }
 
     /**
-     * Get affinity assignment for the given topology version.
-     *
-     * @param topVer Toplogy version.
-     * @return Affinity affignment.
-     */
-    public GridAffinityAssignment assignment(AffinityTopologyVersion topVer) {
-        if (cctx.isLocal())
-            topVer = new AffinityTopologyVersion(1);
-
-        GridAffinityAssignmentCache aff0 = aff;
-
-        if (aff0 == null)
-            throw new IgniteException(FAILED_TO_FIND_CACHE_ERR_MSG + cctx.name());
-
-        return aff0.cachedAffinity(topVer);
-    }
-
-    /**
      * @param topVer Topology version.
      * @return Affinity assignments.
      */
@@ -266,6 +248,24 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter
{
     }
 
     /**
+     * Get affinity assignment for the given topology version.
+     *
+     * @param topVer Toplogy version.
+     * @return Affinity affignment.
+     */
+    public GridAffinityAssignment assignment(AffinityTopologyVersion topVer) {
+        if (cctx.isLocal())
+            topVer = new AffinityTopologyVersion(1);
+
+        GridAffinityAssignmentCache aff0 = aff;
+
+        if (aff0 == null)
+            throw new IgniteException(FAILED_TO_FIND_CACHE_ERR_MSG + cctx.name());
+
+        return aff0.cachedAffinity(topVer);
+    }
+
+    /**
      * @param key Key to check.
      * @param topVer Topology version.
      * @return Primary node for given key.


Mime
View raw message