Skip to content

perf: eliminate N+1 queries in __make_cre_links and __get_all_nodes_and_cres #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shiwani42 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: eliminate N+1 queries in __make_cre_links and __get_all_nodes_and_cres #850

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions application/database/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,16 +870,14 @@ def __get_all_nodes_and_cres(
self, cres_only: bool = False
) -> List[cre_defs.Document]:
result = []
nodes = []
cres = []
if not cres_only:
node_ids = self.session.query(Node.id).all()
for nid in node_ids:
result.extend(self.get_nodes(db_id=nid[0]))
for node in self.session.query(Node).all():
result.extend(self.get_nodes(db_id=node.id))

cre_ids = self.session.query(CRE.id).all()
for cid in cre_ids:
result.append(self.get_cre_by_db_id(cid[0]))
for cre in self.session.query(CRE).all():
cres = self.get_CREs(external_id=cre.external_id)
if cres:
result.append(cres[0])
return result

@classmethod
Expand Down Expand Up @@ -1334,9 +1332,14 @@ def __make_cre_links(
self, cre: CRE, include_only_nodes: List[str]
) -> List[cre_defs.Link]:
links = []
for link in self.session.query(Links).filter(Links.cre == cre.id).all():
node = self.session.query(Node).filter(Node.id == link.node).first()
if node and (not include_only_nodes or node.name in include_only_nodes):
rows = (
self.session.query(Links, Node)
.join(Node, Node.id == Links.node)
.filter(Links.cre == cre.id)
.all()
)
for link, node in rows:
if not include_only_nodes or node.name in include_only_nodes:
links.append(
cre_defs.Link(
ltype=cre_defs.LinkTypes.from_str(link.type),
Expand Down