[#65] speed up loading branch results page

Kraken-CI · Dec 17, 2020 · 1e0b1bc · 1e0b1bc
1 parent b249814
commit 1e0b1bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/server/kraken/server/execution.py b/server/kraken/server/execution.py
@@ -368,9 +368,15 @@ def get_flows(branch_id, kind, start=0, limit=10, middle=None):
     else:
         kind = 0
     q = Flow.query.filter_by(branch_id=branch_id, kind=kind)
+    q = q.options(joinedload('branch'),
+                  joinedload('branch.project'),
+                  joinedload('branch.stages'),
+                  joinedload('artifacts_files'),
+                  joinedload('runs'),
+                  joinedload('runs.artifacts_files'))
     if middle is None:
-        q = q.order_by(desc(Flow.created))
         total = q.count()
+        q = q.order_by(desc(Flow.created))
         q = q.offset(start).limit(limit)
         for flow in q.all():
             flows.append(flow.get_json())

diff --git a/server/kraken/server/models.py b/server/kraken/server/models.py
@@ -90,7 +90,7 @@ class Branch(db.Model, DatesMixin):
                             primaryjoin="and_(Branch.id==Flow.branch_id, Flow.kind==0)", viewonly=True)
     dev_flows = relationship("Flow", order_by="desc(Flow.created)",
                              primaryjoin="and_(Branch.id==Flow.branch_id, Flow.kind==1)", viewonly=True)
-    stages = relationship("Stage", back_populates="branch", lazy="dynamic", order_by="Stage.name")
+    stages = relationship("Stage", back_populates="branch", order_by="Stage.name")
     sequences = relationship("BranchSequence", back_populates="branch")
 
     #base_branch = relationship('BaseBranch', uselist=False, primaryjoin="or_(Branch.id==BaseBranch.ci_branch_id, Branch.id==BaseBranch.dev_branch_id)")
@@ -108,7 +108,7 @@ def get_json(self, with_results=False, with_cfg=False):
             data['ci_flows'] = [f.get_json() for f in self.ci_flows[:10]]
             data['dev_flows'] = [f.get_json() for f in self.dev_flows[:10]]
         if with_cfg:
-            data['stages'] = [s.get_json() for s in self.stages.filter_by(deleted=None)]
+            data['stages'] = [s.get_json() for s in self.stages if s.deleted is None]
         return data
 
 
@@ -277,7 +277,7 @@ def get_json(self):
                     project_id=self.branch.project_id,
                     project_name=self.branch.project.name,
                     args=self.args,
-                    stages=[s.get_json() for s in self.branch.stages.filter_by(deleted=None)],
+                    stages=[s.get_json() for s in self.branch.stages if s.deleted is None],
                     runs=[r.get_json() for r in self.runs],
                     trigger=trigger,
                     artifacts=self.artifacts)