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-12-07 07:41:13 +01:00
|
|
|
index 33990e4f9b5e7e3d8080c80f639b81b7f798c859..742af4feb3986ca7d8f5ed136b556a41cbe0722f 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
|
2023-12-07 07:41:13 +01:00
|
|
|
@@ -35,13 +35,13 @@ 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);
|
2023-12-05 23:12:48 +01:00
|
|
|
- private final Reference2IntMap<T> toId = Util.make(new Reference2IntOpenHashMap<>(), (map) -> {
|
2023-12-07 07:41:13 +01:00
|
|
|
+ private final Reference2IntMap<T> toId = Util.make(new Reference2IntOpenHashMap<>(2048), (map) -> { // Paper - use bigger expected size to reduce collisions
|
|
|
|
map.defaultReturnValue(-1);
|
|
|
|
});
|
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<>();
|
|
|
|
+ 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;
|