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
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								--- a/src/main/java/net/minecraft/core/MappedRegistry.java
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+++ b/src/main/java/net/minecraft/core/MappedRegistry.java
 
							 
						 
					
						
							
								
									
										
										
										
											2022-02-28 22:43:03 -07:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								@@ -0,0 +0,0 @@ import org.slf4j.Logger;
 
							 
						 
					
						
							
								
									
										
										
										
											2021-11-24 14:26:32 -08:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								 public class MappedRegistry<T> extends WritableRegistry<T> {
							 
						 
					
						
							
								
									
										
										
										
											2022-02-28 22:43:03 -07:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								     private static final Logger LOGGER = LogUtils.getLogger();
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								     private final ObjectList<Holder.Reference<T>> byId = new ObjectArrayList<>(256);
							 
						 
					
						
							
								
									
										
										
										
											2021-11-24 14:26:32 -08:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								-    private final Object2IntMap<T> toId = Util.make(new Object2IntOpenCustomHashMap<>(Util.identityStrategy()), (object2IntOpenCustomHashMap) -> {
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								-        object2IntOpenCustomHashMap.defaultReturnValue(-1);
 
							 
						 
					
						
							
								
									
										
										
										
											2021-11-23 16:50:18 +01:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								-    });
 
							 
						 
					
						
							
								
									
										
										
										
											2022-02-28 22:43:03 -07: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-02-28 22:43:03 -07: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
 
							 
						 
					
						
							
								
									
										
										
										
											2021-11-23 16:50:18 +01:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								     private Lifecycle elementsLifecycle;
							 
						 
					
						
							
								
									
										
										
										
											2022-02-28 22:43:03 -07:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								     private volatile Map<TagKey<T>, HolderSet.Named<T>> tags = new IdentityHashMap<>();
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								     private boolean frozen;
							 
						 
					
						
							
								
									
										
										
										
											2021-11-23 16:50:18 +01:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								@@ -0,0 +0,0 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
 
							 
						 
					
						
							
								
									
										
										
										
											2022-02-28 22:43:03 -07:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								             this.intrusiveHolderCache = new IdentityHashMap<>();
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								         }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2021-11-23 16:50:18 +01:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								+        this.toId.defaultReturnValue(-1); // Paper
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								     }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2022-02-28 22:43:03 -07:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								     private List<Holder.Reference<T>> holdersInOrder() {