2020-05-06 11:48:49 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2020-04-13 00:31:14 +02:00
From: Spottedleaf <spottedleaf@spottedleaf.dev>
Date: Mon, 6 Apr 2020 17:39:25 -0700
Subject: [PATCH] Reduce memory footprint of NBTTagCompound
Fastutil maps are going to have a lower memory footprint - which
is important because we clone chunk data after reading it for safety.
So, reduce the impact of the clone on GC.
diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
2020-06-26 03:53:21 +02:00
index 9c445902e6adc05773497bc4444203ca364e4f5c..f608b35502890650adfc1df35e0794471f57ecbc 100644
2020-04-13 00:31:14 +02:00
--- a/src/main/java/net/minecraft/server/NBTTagCompound.java
+++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
2020-06-26 03:53:21 +02:00
@@ -41,7 +41,7 @@ public class NBTTagCompound implements NBTBase {
2020-04-13 00:31:14 +02:00
if (i > 512) {
throw new RuntimeException("Tried to read NBT tag with too high complexity, depth > 512");
} else {
- HashMap hashmap = Maps.newHashMap();
+ it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<String, NBTBase> hashmap = new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(8, 0.8f); // Paper - reduce memory footprint of NBTTagCompound
byte b0;
2020-06-26 03:53:21 +02:00
@@ -77,7 +77,7 @@ public class NBTTagCompound implements NBTBase {
2020-04-13 00:31:14 +02:00
}
public NBTTagCompound() {
- this(Maps.newHashMap());
+ this(new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(8, 0.8f)); // Paper - reduce memory footprint of NBTTagCompound
}
@Override
2020-06-26 03:53:21 +02:00
@@ -409,9 +409,17 @@ public class NBTTagCompound implements NBTBase {
2020-04-13 00:31:14 +02:00
@Override
public NBTTagCompound clone() {
- Map<String, NBTBase> map = Maps.newHashMap(Maps.transformValues(this.map, NBTBase::clone));
+ // Paper start - reduce memory footprint of NBTTagCompound
+ it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<String, NBTBase> ret = new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(this.map.size(), 0.8f);
- return new NBTTagCompound(map);
+ Iterator<Map.Entry<String, NBTBase>> iterator = (this.map instanceof it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap) ? ((it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap)this.map).object2ObjectEntrySet().fastIterator() : this.map.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry<String, NBTBase> entry = iterator.next();
+ ret.put(entry.getKey(), entry.getValue().clone());
+ }
+
+ return new NBTTagCompound(ret);
+ // Paper end - reduce memory footprint of NBTTagCompound
}
public boolean equals(Object object) {