Skip to content

Use a concurrent cache in CraftRegistry #13973

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

Open
electronicboy wants to merge 1 commit into
base: dev/26.2
Choose a base branch
from
+7 −12
Open

Use a concurrent cache in CraftRegistry #13973

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
19 changes: 7 additions & 12 deletions paper-server/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import io.papermc.paper.util.Holderable;
import io.papermc.paper.util.MCUtil;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiFunction;
import java.util.stream.Stream;
import net.minecraft.core.Holder;
Expand Down Expand Up @@ -148,12 +148,12 @@ public static <B extends Keyed> B get(RegistryKey<B> bukkitKey, NamespacedKey na
}

private final Class<?> bukkitClass; // Paper - relax preload class
private final Map<NamespacedKey, B> cache = new HashMap<>();
private final Map<NamespacedKey, B> cache = new ConcurrentHashMap<>();
private final net.minecraft.core.Registry<M> minecraftRegistry;
private final io.papermc.paper.registry.entry.RegistryTypeMapper<M, B> minecraftToBukkit; // Paper - switch to Holder
private final BiFunction<NamespacedKey, ApiVersion, NamespacedKey> serializationUpdater; // Paper - rename to make it *clear* what it is *only* for
private final InvalidHolderOwner invalidHolderOwner = new InvalidHolderOwner();
private boolean lockReferenceHolders;
private volatile boolean lockReferenceHolders;

public CraftRegistry(Class<?> bukkitClass, net.minecraft.core.Registry<M> minecraftRegistry, BiFunction<? super NamespacedKey, M, B> minecraftToBukkit, BiFunction<NamespacedKey, ApiVersion, NamespacedKey> serializationUpdater) { // Paper - relax preload class
// Paper start - switch to Holder
Expand Down Expand Up @@ -190,11 +190,10 @@ public void lockReferenceHolders() {

@Override
public B get(NamespacedKey namespacedKey) {
B cached = this.cache.get(namespacedKey);
if (cached != null) {
return cached;
}
return this.cache.computeIfAbsent(namespacedKey, this::loadBukkit);
}
Comment thread
electronicboy marked this conversation as resolved.

private B loadBukkit(final NamespacedKey namespacedKey) {
// Important to use the ResourceKey<?> "get" method below because it will work before registry is frozen
final Optional<Holder.Reference<M>> holderOptional = this.minecraftRegistry.get(CraftNamespacedKey.toResourceKey(this.minecraftRegistry.key(), namespacedKey));
final Holder.Reference<M> holder;
Expand All @@ -208,11 +207,7 @@ public B get(NamespacedKey namespacedKey) {
} else {
return null;
}
final B bukkit = this.createBukkit(holder);

this.cache.put(namespacedKey, bukkit);

return bukkit;
return this.createBukkit(holder);
}

@NotNull
Expand Down
Loading