From 14838a92ee21534f6b235a3edef753399bd61708 Mon Sep 17 00:00:00 2001
From: XP <smurfs@smurfs.verymad.net>
Date: Wed, 11 Sep 2024 19:27:57 -0700
Subject: [PATCH] Reduce memory used for recipes

---
 .idea/runConfigurations/xivgear_data_api__run_.xml       | 2 +-
 .../gg/xp/xivgear/dataapi/datamanager/DataManager.groovy | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.idea/runConfigurations/xivgear_data_api__run_.xml b/.idea/runConfigurations/xivgear_data_api__run_.xml
index ca655ae..f6e5ad7 100644
--- a/.idea/runConfigurations/xivgear_data_api__run_.xml
+++ b/.idea/runConfigurations/xivgear_data_api__run_.xml
@@ -18,7 +18,7 @@
           <option value="run" />
         </list>
       </option>
-      <option name="vmOptions" value="-Dmicronaut.openapi.json.format=false" />
+      <option name="vmOptions" value="-XX:+UseG1GC -XX:MinHeapFreeRatio=15 -XX:MaxHeapFreeRatio=30 -XX:MaxRAMPercentage=70" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
diff --git a/src/main/groovy/gg/xp/xivgear/dataapi/datamanager/DataManager.groovy b/src/main/groovy/gg/xp/xivgear/dataapi/datamanager/DataManager.groovy
index 53a6ba9..a91bf1f 100644
--- a/src/main/groovy/gg/xp/xivgear/dataapi/datamanager/DataManager.groovy
+++ b/src/main/groovy/gg/xp/xivgear/dataapi/datamanager/DataManager.groovy
@@ -212,6 +212,7 @@ class DataManager implements AutoCloseable {
 					)
 			)
 			List<ItemBase> itemBases = client.getSearchIterator(ItemBase, itemFilter).toList().toSorted { it.rowId }
+			Set<Integer> itemIds = itemBases.collect { it.rowId }.toSet()
 			log.info "Loaded ${itemBases.size()} Items"
 
 			log.info "Loading Recipes"
@@ -227,8 +228,12 @@ class DataManager implements AutoCloseable {
 //					)
 			)
 			List<Recipe> recipes = client.getSearchIterator(Recipe, recipeFilter).toList()
-			Set<Integer> itemsWithRecipes = recipes.collect { it.itemResult }.toSet()
-			log.info "Loaded ${recipes.size()} Recipes"
+			// Only retain items that were in our original result set
+			Set<Integer> itemsWithRecipes = recipes
+					.collect { it.itemResult }
+					.findAll { it in itemIds }
+					.toSet()
+			log.info "Loaded ${itemsWithRecipes.size()} Recipes"
 
 			// There is currently no good way to do shops. SpecialShop items have a 60-item "Items" array which results
 			// in a massive response. It is too slow and bloated to consume raw. Trying to filter also results in