ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/24] ignite git commit: Removed unused method GridDhtPartitionTopology.checkEvictions().
Date Mon, 10 Jul 2017 07:20:41 GMT
Removed unused method GridDhtPartitionTopology.checkEvictions().


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

Branch: refs/heads/ignite-2.1.2-grpId
Commit: a1cac1b7cc1c3afdcc12afb08bf1ecdcb6f28828
Parents: ea4420e
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Jul 7 15:55:18 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Jul 7 15:55:18 2017 +0300

----------------------------------------------------------------------
 .../dht/GridClientPartitionTopology.java        |  5 ---
 .../dht/GridDhtPartitionTopology.java           |  7 ++--
 .../dht/GridDhtPartitionTopologyImpl.java       | 36 --------------------
 3 files changed, 2 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a1cac1b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index 9e9f4fb..e751961 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -828,11 +828,6 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology
{
         return Collections.emptyList();
     }
 
-    /** {@inheritDoc} */
-    @Override public void checkEvictions() {
-        // No-op.
-    }
-
     /**
      * Updates value for single partition.
      *

http://git-wip-us.apache.org/repos/asf/ignite/blob/a1cac1b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
index bf4e844..5f76d12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
@@ -280,11 +280,6 @@ public interface GridDhtPartitionTopology {
     public Collection<Integer> lostPartitions();
 
     /**
-     *
-     */
-    public void checkEvictions();
-
-    /**
      * @param skipZeros If {@code true} then filters out zero counters.
      * @return Partition update counters.
      */
@@ -324,6 +319,7 @@ public interface GridDhtPartitionTopology {
     /**
      * Make nodes from provided set owners for a given partition.
      * State of all current owners that aren't contained in the set will be reset to MOVING.
+     *
      * @param p Partition ID.
      * @param updateSeq If should increment sequence when updated.
      * @param owners Set of new owners.
@@ -333,6 +329,7 @@ public interface GridDhtPartitionTopology {
 
     /**
      * Callback on exchange done.
+     *
      * @param assignment New affinity assignment.
      */
     public void onExchangeDone(AffinityAssignment assignment);

http://git-wip-us.apache.org/repos/asf/ignite/blob/a1cac1b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index f49dccf..cf0dd5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -1745,42 +1745,6 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology
{
 
     /**
      * @param updateSeq Update sequence.
-     * @return {@code True} if state changed.
-     */
-    private boolean checkEvictions(long updateSeq) {
-        AffinityTopologyVersion affVer = grp.affinity().lastVersion();
-
-        boolean changed = false;
-
-        if (!affVer.equals(AffinityTopologyVersion.NONE) && affVer.compareTo(topVer)
>= 0) {
-            List<List<ClusterNode>> aff = grp.affinity().assignments(topVer);
-
-            changed = checkEvictions(updateSeq, aff);
-
-            updateRebalanceVersion(aff);
-        }
-
-        return changed;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void checkEvictions() {
-        lock.writeLock().lock();
-
-        try {
-            long updateSeq = this.updateSeq.incrementAndGet();
-
-            node2part.newUpdateSequence(updateSeq);
-
-            checkEvictions(updateSeq);
-        }
-        finally {
-            lock.writeLock().unlock();
-        }
-    }
-
-    /**
-     * @param updateSeq Update sequence.
      * @param aff Affinity assignments.
      * @return Checks if any of the local partitions need to be evicted.
      */


Mime
View raw message