github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactoring

Browse Source
pull/3696/head
Nikita Koksharov 4 years ago
parent 4acdf567d7
commit a155dde743
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
Unescape Escape View File

@ -661,10 +661,8 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
Set<ClusterPartition> clusterLastPartitions = getLastPartitions(); Set<ClusterPartition> clusterLastPartitions = getLastPartitions();
// https://github.com/redisson/redisson/issues/3635 // https://github.com/redisson/redisson/issues/3635
Map<String, MasterSlaveEntry> nodeEntry = new HashMap<>(); Map<String, MasterSlaveEntry> nodeEntries = clusterLastPartitions.stream().collect(Collectors.toMap(p -> p.getNodeId(),
clusterLastPartitions.forEach(partition -> { p -> getEntry(p.slots().nextSetBit(0))));
nodeEntry.put(partition.getNodeId(), getEntry(partition.slots().nextSetBit(0)));
});
Set<Integer> changedSlots = new HashSet<>(); Set<Integer> changedSlots = new HashSet<>();
for (ClusterPartition currentPartition : clusterLastPartitions) { for (ClusterPartition currentPartition : clusterLastPartitions) {
@ -674,7 +672,7 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
continue; continue;
} }
MasterSlaveEntry entry = nodeEntry.get(nodeId); MasterSlaveEntry entry = nodeEntries.get(nodeId);
BitSet addedSlots = newPartition.copySlots(); BitSet addedSlots = newPartition.copySlots();
addedSlots.andNot(currentPartition.slots()); addedSlots.andNot(currentPartition.slots());
currentPartition.addSlots(addedSlots); currentPartition.addSlots(addedSlots);

Write Preview
Loading…
Cancel
Save