Merge pull request #4 from xiv-gear-planner/optimize-recipe-memory

Reduce memory used for recipes
xiv-gear-planner · Sep 12, 2024 · aa4fedd · aa4fedd
2 parents aa8aeb3 + 14838a9
commit aa4fedd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.idea/runConfigurations/xivgear_data_api__run_.xml b/.idea/runConfigurations/xivgear_data_api__run_.xml
diff --git 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