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 2016/01/01 22:07:30 UTC
[03/18] ignite git commit: IGNITE-2263: DANGEROUS! Removed F.view()
from GridClientPartitionTopology.
IGNITE-2263: DANGEROUS! Removed F.view() from GridClientPartitionTopology.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe8d0858
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe8d0858
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe8d0858
Branch: refs/heads/ignite-2263
Commit: fe8d08589b855b30d056e099144bfe2506c051af
Parents: a462003
Author: thatcoach <pp...@list.ru>
Authored: Fri Jan 1 16:11:28 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Fri Jan 1 16:11:28 2016 +0300
----------------------------------------------------------------------
.../dht/GridClientPartitionTopology.java | 35 ++++++++++----------
1 file changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe8d0858/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 9c18ad0..3785654 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
@@ -17,16 +17,6 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
@@ -45,9 +35,18 @@ import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.EVICTED;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
/**
* Partition topology for node which does not have any local partitions.
@@ -697,11 +696,13 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology {
// Remove obsolete mappings.
if (cur != null) {
- for (Integer p : F.view(cur.keySet(), F.notIn(parts.keySet()))) {
- Set<UUID> ids = part2node.get(p);
+ for (Integer p : cur.keySet()) {
+ if (!parts.keySet().contains(p)) {
+ Set<UUID> ids = part2node.get(p);
- if (ids != null)
- changed |= ids.remove(parts.nodeId());
+ if (ids != null)
+ changed |= ids.remove(parts.nodeId());
+ }
}
}