From 8e98af85170118886f71f72f6e1f93998db480cd Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Thu, 14 Mar 2019 14:15:01 -0400
Subject: [PATCH] Performance improvement when collecting counts for
 categories. Instead of making n calls for each category to sql, we get a
 grouped count by shipID, then process this in python, which is much faster.

---
 eos/config.py               | 2 +-
 eos/db/saveddata/queries.py | 7 +++++++
 gui/shipBrowser.py          | 5 +++--
 service/fit.py              | 5 +++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/eos/config.py b/eos/config.py
index c6c53f748..0ea812008 100644
--- a/eos/config.py
+++ b/eos/config.py
@@ -19,7 +19,7 @@ if istravis is True or hasattr(sys, '_called_from_test'):
     # Running in Travis. Run saveddata database in memory.
     saveddata_connectionstring = 'sqlite:///:memory:'
 else:
-    saveddata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata-py3-db.db"))
+    saveddata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db"))
 
 pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring)
 
diff --git a/eos/db/saveddata/queries.py b/eos/db/saveddata/queries.py
index 448584420..ae66e9285 100644
--- a/eos/db/saveddata/queries.py
+++ b/eos/db/saveddata/queries.py
@@ -21,6 +21,7 @@ import sys
 
 from sqlalchemy.sql import and_
 from sqlalchemy import desc, select
+from sqlalchemy import func
 
 from eos.db import saveddata_session, sd_lock
 from eos.db.saveddata.fit import projectedFits_table
@@ -283,6 +284,12 @@ def countAllFits():
     return count
 
 
+def countFitGroupedByShip():
+    with sd_lock:
+        count = eos.db.saveddata_session.query(Fit.shipID, func.count(Fit.shipID)).group_by(Fit.shipID).all()
+    return count
+
+
 def countFitsWithShip(lookfor, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index 75152a1b4..f103d9560 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -164,11 +164,12 @@ class ShipBrowser(wx.Panel):
             self.categoryList = list(sMkt.getShipRoot())
             self.categoryList.sort(key=lambda _ship: _ship.name)
 
+            counts = sFit.countAllFitsGroupedByShip()
+
             # set map & cache of fittings per category
             for cat in self.categoryList:
                 itemIDs = [x.ID for x in cat.items]
-                num = sFit.countFitsWithShip(itemIDs)
-                self.categoryFitCache[cat.ID] = num > 0
+                self.categoryFitCache[cat.ID] = sum([count for shipID, count in counts if shipID in itemIDs]) > 0
 
         for ship in self.categoryList:
             if self.filterShipsWithNoFits and not self.categoryFitCache[ship.ID]:
diff --git a/service/fit.py b/service/fit.py
index 035bb50ee..73b6c7f41 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -146,6 +146,11 @@ class Fit(FitDeprecated):
         pyfalog.debug("Getting count of all fits.")
         return eos.db.countAllFits()
 
+    @staticmethod
+    def countAllFitsGroupedByShip():
+        count = eos.db.countFitGroupedByShip()
+        return count
+
     @staticmethod
     def countFitsWithShip(stuff):
         pyfalog.debug("Getting count of all fits for: {0}", stuff)