Repository: ignite Updated Branches: refs/heads/master 6225c56ea -> 7f22f08f7
IGNITE-8936: Remove AffinityAssignment#clientEventChange as not used. - Fixes #4448. Signed-off-by: Nikolay Izhikov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f22f08f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f22f08f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f22f08f Branch: refs/heads/master Commit: 7f22f08f7db0f45a5cde97307c68fc81cb6eb26c Parents: 6225c56 Author: Nikolai Kulagin <[email protected]> Authored: Thu Sep 6 12:43:08 2018 +0300 Committer: Nikolay Izhikov <[email protected]> Committed: Thu Sep 6 12:43:08 2018 +0300 ---------------------------------------------------------------------- .../processors/affinity/AffinityAssignment.java | 6 ------ .../processors/affinity/GridAffinityAssignment.java | 15 --------------- .../affinity/HistoryAffinityAssignment.java | 9 --------- 3 files changed, 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7f22f08f/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java index 1c321d3..eb06d3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityAssignment.java @@ -29,12 +29,6 @@ import org.apache.ignite.internal.processors.cache.mvcc.MvccCoordinator; */ public interface AffinityAssignment { /** - * @return {@code True} if related discovery event did not not cause affinity assignment change and - * this assignment is just reference to the previous one. - */ - public boolean clientEventChange(); - - /** * @return Affinity assignment computed by affinity function. */ public List<List<ClusterNode>> idealAssignment(); http://git-wip-us.apache.org/repos/asf/ignite/blob/7f22f08f/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java index f96bc9d..c4dfa8b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java @@ -65,9 +65,6 @@ public class GridAffinityAssignment implements AffinityAssignment, Serializable /** */ private transient List<List<ClusterNode>> idealAssignment; - /** */ - private final boolean clientEvtChange; - /** * Constructs cached affinity calculations item. * @@ -78,7 +75,6 @@ public class GridAffinityAssignment implements AffinityAssignment, Serializable primary = new HashMap<>(); backup = new HashMap<>(); mvccCrd = null; - clientEvtChange = false; } /** @@ -101,7 +97,6 @@ public class GridAffinityAssignment implements AffinityAssignment, Serializable primary = new HashMap<>(); backup = new HashMap<>(); - clientEvtChange = false; initPrimaryBackupMaps(); } @@ -118,16 +113,6 @@ public class GridAffinityAssignment implements AffinityAssignment, Serializable primary = aff.primary; backup = aff.backup; mvccCrd = aff.mvccCrd; - - clientEvtChange = true; - } - - /** - * @return {@code True} if related discovery event did not not cause affinity assignment change and - * this assignment is just reference to the previous one. - */ - public boolean clientEventChange() { - return clientEvtChange; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7f22f08f/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignment.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignment.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignment.java index 1a6b2ef..a949648 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignment.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/HistoryAffinityAssignment.java @@ -43,9 +43,6 @@ public class HistoryAffinityAssignment implements AffinityAssignment { private final List<List<ClusterNode>> idealAssignment; /** */ - private final boolean clientEvtChange; - - /** */ private final MvccCoordinator mvccCrd; /** @@ -56,7 +53,6 @@ public class HistoryAffinityAssignment implements AffinityAssignment { this.assignment = assign.assignment(); this.idealAssignment = assign.idealAssignment(); this.mvccCrd = assign.mvccCoordinator(); - this.clientEvtChange = assign.clientEventChange(); } /** {@inheritDoc} */ @@ -65,11 +61,6 @@ public class HistoryAffinityAssignment implements AffinityAssignment { } /** {@inheritDoc} */ - @Override public boolean clientEventChange() { - return clientEvtChange; - } - - /** {@inheritDoc} */ @Override public List<List<ClusterNode>> idealAssignment() { return idealAssignment; }
