ignite-99 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5b5bd2fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b5bd2fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b5bd2fb Branch: refs/heads/ignite-99 Commit: 5b5bd2fbbdbf40f2101a94496f2abab0897d021e Parents: ff867a4 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jan 21 21:14:01 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jan 21 21:14:01 2015 +0300 ---------------------------------------------------------------------- .../gridgain/client/GridClientAbstractMultiThreadedSelfTest.java | 4 ++-- .../processors/affinity/CacheAffinityFunctionContextImpl.java | 2 +- .../kernal/processors/cache/affinity/CacheAffinityProxy.java | 2 +- .../cache/datastructures/GridCacheInternalKeyImpl.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b5bd2fb/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java index 95274a1..9d6b190 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java @@ -282,8 +282,8 @@ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommon final String key = "k0"; Collection<UUID> affNodesIds = F.viewReadOnly( - grid(0).affinity(data.cacheName()).mapKeyToPrimaryAndBackups(key), - F.node2id()); + grid(0).affinity(data.cacheName()).mapKeyToPrimaryAndBackups(key), + F.node2id()); final GridClientData dataFirst = data.pinNodes(F.first(client.compute().nodes())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b5bd2fb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/CacheAffinityFunctionContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/CacheAffinityFunctionContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/CacheAffinityFunctionContextImpl.java index a2edff9..27f6289 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/CacheAffinityFunctionContextImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/CacheAffinityFunctionContextImpl.java @@ -48,7 +48,7 @@ public class CacheAffinityFunctionContextImpl implements CacheAffinityFunctionCo * @param topVer Topology version. */ public CacheAffinityFunctionContextImpl(List<ClusterNode> topSnapshot, List<List<ClusterNode>> prevAssignment, - IgniteDiscoveryEvent discoEvt, long topVer, int backups) { + IgniteDiscoveryEvent discoEvt, long topVer, int backups) { this.topSnapshot = topSnapshot; this.prevAssignment = prevAssignment; this.discoEvt = discoEvt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b5bd2fb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/CacheAffinityProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/CacheAffinityProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/CacheAffinityProxy.java index a204aac..cb33cfd 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/CacheAffinityProxy.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/CacheAffinityProxy.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.affinity; -import org.apache.ignite.IgniteCacheAffinity; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.gridgain.grid.kernal.processors.cache.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b5bd2fb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheInternalKeyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheInternalKeyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheInternalKeyImpl.java index 0b18de2..258fc07 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheInternalKeyImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheInternalKeyImpl.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; -import org.apache.ignite.cache.affinity.CacheAffinityKeyMapped; +import org.apache.ignite.cache.affinity.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*;