Skip to content

Optimize list_groups_info query: replace OR join predicate with LATERAL JOIN + UNION #2337

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

Closed
Copilot wants to merge 2 commits into from
Closed

Optimize list_groups_info query: replace OR join predicate with LATERAL JOIN + UNION #2337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a5840a
Initial plan
Copilot Mar 13, 2026
d6c795d
Optimize list_groups_info query using LATERAL JOIN with UNION
Copilot Mar 13, 2026
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
6 changes: 3 additions & 3 deletions ...5799549a3a4bf9735f7fd160b359653e5fe5.json → ...df5f13b6d71296c7e9b7859a6ecbb495dbfb.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions crates/defguard_core/src/handlers/group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,13 @@ pub(crate) async fn list_groups_info(
FROM \"group\" g \
LEFT JOIN \"group_user\" gu ON gu.group_id = g.id \
LEFT JOIN \"user\" u ON u.id = gu.user_id \
LEFT JOIN \"wireguard_network_allowed_group\" wnag ON wnag.group_id = g.id \
LEFT JOIN \"wireguard_network\" wn ON wn.allow_all_groups OR wn.id = wnag.network_id \
LEFT JOIN LATERAL (\
SELECT wn_inner.name FROM \"wireguard_network\" wn_inner \
JOIN \"wireguard_network_allowed_group\" wnag ON wnag.network_id = wn_inner.id AND wnag.group_id = g.id \
UNION \
SELECT wn_all.name FROM \"wireguard_network\" wn_all \
WHERE wn_all.allow_all_groups\
) wn ON true \
GROUP BY g.name, g.id"
)
.fetch_all(&appstate.pool)
Expand Down