Skip to content

Optimize WeakConcurrentCollection removeAll and retainAll lookup complexity #329

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

Closed
Smorki wants to merge 5 commits into from
Closed

Optimize WeakConcurrentCollection removeAll and retainAll lookup complexity #329

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41dacc3
Optimize WeakConcurrentCollection removeAll and retainAll lookup comp…
Smorki Aug 23, 2026
f8310e5
Merge branch 'main' into perf/optimize-weak-concurrent-collection
Smorki Aug 23, 2026
5957e79
Restore missing imports in WeakConcurrentCollection
Smorki Aug 23, 2026
2dff941
Merge branch 'perf/optimize-weak-concurrent-collection' of https://gi…
Smorki Aug 23, 2026
df3f9ad
Fix NonNull symbol error in WeakConcurrentCollection
Smorki Aug 23, 2026
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
24 changes: 16 additions & 8 deletions canvas-server/src/main/java/io/canvasmc/canvas/util/WeakConcurrentCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import java.lang.ref.WeakReference;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger;
import org.jspecify.annotations.Nullable;
Expand Down Expand Up @@ -137,11 +140,15 @@ public boolean addAll(final Collection<? extends E> collection) {
}

@Override
public boolean removeAll(final Collection<?> collection) {
public boolean removeAll(final Collection<?> c) {
if (c.isEmpty()) {
return false;
}
final Collection<?> target = c instanceof Set<?> ? c : new HashSet<>(c);
boolean changed = false;
for (final WeakReference<E> ref : backed) {
final E value = ref.get();
if (value != null && collection.contains(value)) {
for (WeakReference<E> ref : backed) {
E value = ref.get();
if (value != null && target.contains(value)) {
ref.clear();
if (backed.remove(ref)) {
liveCount.decrementAndGet();
Expand All @@ -153,11 +160,12 @@ public boolean removeAll(final Collection<?> collection) {
}

@Override
public boolean retainAll(final Collection<?> collection) {
public boolean retainAll(final Collection<?> c) {
final Collection<?> target = c.isEmpty() ? Collections.emptySet() : (c instanceof Set<?> ? c : new HashSet<>(c));
boolean changed = false;
for (final WeakReference<E> ref : backed) {
final E value = ref.get();
if (value != null && !collection.contains(value)) {
for (WeakReference<E> ref : backed) {
E value = ref.get();
if (value != null && !target.contains(value)) {
ref.clear();
if (backed.remove(ref)) {
liveCount.decrementAndGet();
Expand Down
Loading