Skip to content

FIX: Make sure to create readonly copy of locator that has same shape with original one. #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhpark816 merged 1 commit into from
Jul 4, 2024
Merged

FIX: Make sure to create readonly copy of locator that has same shape with original one. #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions src/main/java/net/spy/memcached/ArcusKetamaNodeLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,31 +175,28 @@ public Iterator<MemcachedNode> getSequence(String k) {
}

public NodeLocator getReadonlyCopy() {
TreeMap<Long, SortedSet<MemcachedNode>> smn =
new TreeMap<>(ketamaNodes);
Collection<MemcachedNode> an = new ArrayList<>(
allNodes.size());

lock.lock();
try {
TreeMap<Long, SortedSet<MemcachedNode>> ketamaCopy = new TreeMap<>();
Collection<MemcachedNode> nodesCopy = new ArrayList<>(allNodes.size());

// Rewrite the values a copy of the map.
for (Map.Entry<Long, SortedSet<MemcachedNode>> me : smn.entrySet()) {
SortedSet<MemcachedNode> nodeROSet =
new TreeSet<>(config.new NodeNameComparator());
for (MemcachedNode mn : me.getValue()) {
nodeROSet.add(new MemcachedNodeROImpl(mn));
for (Map.Entry<Long, SortedSet<MemcachedNode>> hashPoint : ketamaNodes.entrySet()) {
SortedSet<MemcachedNode> nodeROSet = new TreeSet<>(config.new NodeNameComparator());
for (MemcachedNode node : hashPoint.getValue()) {
nodeROSet.add(new MemcachedNodeROImpl(node));
}
me.setValue(nodeROSet);
ketamaCopy.put(hashPoint.getKey(), nodeROSet);
}
// Copy the allNodes collection.
for (MemcachedNode n : allNodes) {
an.add(new MemcachedNodeROImpl(n));
for (MemcachedNode node : allNodes) {
nodesCopy.add(new MemcachedNodeROImpl(node));
}

return new ArcusKetamaNodeLocator(ketamaCopy, nodesCopy, config);
} finally {
lock.unlock();
}

return new ArcusKetamaNodeLocator(smn, an, config);
}

public void update(Collection<MemcachedNode> toAttach,
Expand Down
30 changes: 14 additions & 16 deletions src/main/java/net/spy/memcached/ArcusReplKetamaNodeLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,36 +205,34 @@ public Iterator<MemcachedNode> getSequence(String k, ReplicaPick pick) {
}

public NodeLocator getReadonlyCopy() {
TreeMap<Long, SortedSet<MemcachedReplicaGroup>> smg =
new TreeMap<>(ketamaGroups);
HashMap<String, MemcachedReplicaGroup> ag =
new HashMap<>(allGroups.size());
Collection<MemcachedNode> an = new ArrayList<>(allNodes.size());

lock.lock();
try {
TreeMap<Long, SortedSet<MemcachedReplicaGroup>> ketamaCopy = new TreeMap<>();
HashMap<String, MemcachedReplicaGroup> groupsCopy = new HashMap<>(allGroups.size());
Collection<MemcachedNode> nodesCopy = new ArrayList<>(allNodes.size());

// Rewrite the values a copy of the map
for (Map.Entry<Long, SortedSet<MemcachedReplicaGroup>> mge : smg.entrySet()) {
for (Map.Entry<Long, SortedSet<MemcachedReplicaGroup>> hashPoint : ketamaGroups.entrySet()) {
SortedSet<MemcachedReplicaGroup> groupROSet = new TreeSet<>(
new ArcusReplKetamaNodeLocatorConfiguration.MemcachedReplicaGroupComparator());
for (MemcachedReplicaGroup mrg : mge.getValue()) {
groupROSet.add(new MemcachedReplicaGroupROImpl(mrg));
for (MemcachedReplicaGroup group : hashPoint.getValue()) {
groupROSet.add(new MemcachedReplicaGroupROImpl(group));
}
mge.setValue(groupROSet);
ketamaCopy.put(hashPoint.getKey(), groupROSet);
}
// copy the allGroups collection.
for (Map.Entry<String, MemcachedReplicaGroup> me : allGroups.entrySet()) {
ag.put(me.getKey(), new MemcachedReplicaGroupROImpl(me.getValue()));
for (Map.Entry<String, MemcachedReplicaGroup> group : allGroups.entrySet()) {
groupsCopy.put(group.getKey(), new MemcachedReplicaGroupROImpl(group.getValue()));
}
// copy the allNodes collection.
for (MemcachedNode n : allNodes) {
an.add(new MemcachedNodeROImpl(n));
for (MemcachedNode node : allNodes) {
nodesCopy.add(new MemcachedNodeROImpl(node));
}

return new ArcusReplKetamaNodeLocator(ketamaCopy, groupsCopy, nodesCopy);
} finally {
lock.unlock();
}

return new ArcusReplKetamaNodeLocator(smg, ag, an);
}

public void update(Collection<MemcachedNode> toAttach, Collection<MemcachedNode> toDelete) {
Expand Down