You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/07/11 09:27:41 UTC
[42/50] ignite git commit: Removed unused method.
Removed unused method.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/92becc89
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/92becc89
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/92becc89
Branch: refs/heads/master
Commit: 92becc8918f0cfc0a0c0d94c19a93d50d5ffb10e
Parents: c52d2bf
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 10 16:59:48 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 10 16:59:48 2017 +0300
----------------------------------------------------------------------
.../GridCachePartitionExchangeManager.java | 42 --------------------
1 file changed, 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/92becc89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index f1db79a..de0adc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -89,7 +89,6 @@ import org.apache.ignite.internal.util.GridListSet;
import org.apache.ignite.internal.util.GridPartitionStateMap;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
-import org.apache.ignite.internal.util.lang.IgnitePair;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.CI1;
@@ -101,7 +100,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.util.worker.GridWorker;
import org.apache.ignite.lang.IgniteBiInClosure;
-import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.thread.IgniteThread;
import org.jetbrains.annotations.Nullable;
@@ -160,10 +158,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
new ConcurrentSkipListMap<>();
/** */
- private final ConcurrentSkipListMap<AffinityTopologyVersion, IgnitePair<IgniteProductVersion>> nodeVers =
- new ConcurrentSkipListMap<>();
-
- /** */
private final AtomicReference<AffinityTopologyVersion> readyTopVer =
new AtomicReference<>(AffinityTopologyVersion.NONE);
@@ -806,18 +800,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
}
/**
- * Gets minimum node version for the given topology version.
- *
- * @param topVer Topology version to get minimum node version for.
- * @return Minimum node version.
- */
- public IgniteProductVersion minimumNodeVersion(AffinityTopologyVersion topVer) {
- IgnitePair<IgniteProductVersion> vers = nodeVers.get(topVer);
-
- return vers == null ? cctx.localNode().version() : vers.get1();
- }
-
- /**
* @return {@code true} if entered to busy state.
*/
private boolean enterBusy() {
@@ -1257,30 +1239,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
if (log.isDebugEnabled())
log.debug("Exchange done [topVer=" + topVer + ", fut=" + exchFut + ", err=" + err + ']');
- IgniteProductVersion minVer = cctx.localNode().version();
- IgniteProductVersion maxVer = cctx.localNode().version();
-
- if (err == null) {
- if (!F.isEmpty(exchFut.discoveryEvent().topologyNodes())) {
- for (ClusterNode node : exchFut.discoveryEvent().topologyNodes()) {
- IgniteProductVersion ver = node.version();
-
- if (ver.compareTo(minVer) < 0)
- minVer = ver;
-
- if (ver.compareTo(maxVer) > 0)
- maxVer = ver;
- }
- }
- }
-
- nodeVers.put(topVer, new IgnitePair<>(minVer, maxVer));
-
- AffinityTopologyVersion histVer = new AffinityTopologyVersion(topVer.topologyVersion() - 10, 0);
-
- for (AffinityTopologyVersion oldVer : nodeVers.headMap(histVer).keySet())
- nodeVers.remove(oldVer);
-
if (err == null) {
while (true) {
AffinityTopologyVersion readyVer = readyTopVer.get();