2021-11-23 16:50:18 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 26 Aug 2018 20:49:50 -0400
Subject: [PATCH] Optimize MappedRegistry
Use larger initial sizes to increase bucket capacity on the BiMap
BiMap.get was seen to be using a good bit of CPU time.
diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java
2023-09-22 19:59:56 +02:00
index dee7ac4dab7e3c1b53f0ff81650ebd922f382ece..26b92e27de1f079ab8440538c65377ed80e8b6ef 100644
2021-11-23 16:50:18 +01:00
--- a/src/main/java/net/minecraft/core/MappedRegistry.java
+++ b/src/main/java/net/minecraft/core/MappedRegistry.java
2022-12-08 04:24:00 +01:00
@@ -36,13 +36,11 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
2022-03-01 06:43:03 +01:00
private static final Logger LOGGER = LogUtils.getLogger();
2022-12-07 20:22:28 +01:00
final ResourceKey<? extends Registry<T>> key;
2022-03-01 06:43:03 +01:00
private final ObjectList<Holder.Reference<T>> byId = new ObjectArrayList<>(256);
2022-12-07 20:22:28 +01:00
- private final Object2IntMap<T> toId = Util.make(new Object2IntOpenCustomHashMap<>(Util.identityStrategy()), (map) -> {
- map.defaultReturnValue(-1);
2021-11-23 16:50:18 +01:00
- });
2022-03-01 06:43:03 +01:00
- private final Map<ResourceLocation, Holder.Reference<T>> byLocation = new HashMap<>();
- private final Map<ResourceKey<T>, Holder.Reference<T>> byKey = new HashMap<>();
- private final Map<T, Holder.Reference<T>> byValue = new IdentityHashMap<>();
- private final Map<T, Lifecycle> lifecycles = new IdentityHashMap<>();
2021-11-23 16:50:18 +01:00
+ private final it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap<T> toId = new it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap<T>(2048);// Paper - use bigger expected size to reduce collisions and direct intent for FastUtil to be identity map
2022-03-01 06:43:03 +01:00
+ private final Map<ResourceLocation, Holder.Reference<T>> byLocation = new HashMap<>(2048); // Paper - use bigger expected size to reduce collisions
+ private final Map<ResourceKey<T>, Holder.Reference<T>> byKey = new HashMap<>(2048); // Paper - use bigger expected size to reduce collisions
+ private final Map<T, Holder.Reference<T>> byValue = new IdentityHashMap<>(2048); // Paper - use bigger expected size to reduce collisions
+ private final Map<T, Lifecycle> lifecycles = new IdentityHashMap<>(2048); // Paper - use bigger expected size to reduce collisions
2022-12-08 04:24:00 +01:00
private Lifecycle registryLifecycle;
2022-03-01 06:43:03 +01:00
private volatile Map<TagKey<T>, HolderSet.Named<T>> tags = new IdentityHashMap<>();
private boolean frozen;
2022-12-07 20:22:28 +01:00
@@ -88,6 +86,7 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
2021-11-23 16:50:18 +01:00
}
2022-12-07 20:22:28 +01:00
public MappedRegistry(ResourceKey<? extends Registry<T>> key, Lifecycle lifecycle, boolean intrusive) {
+ this.toId.defaultReturnValue(-1); // Paper
Bootstrap.checkBootstrapCalled(() -> {
return "registry " + key;
});