Skip to content

perf: replace CAT_OPTIONS correlated subselect with LATERAL JOIN in DXF2 EventQuery #23743

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
jason-p-pickering wants to merge 2 commits into
base: 2.40
Choose a base branch
from
Open

perf: replace CAT_OPTIONS correlated subselect with LATERAL JOIN in DXF2 EventQuery #23743

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c51de7
perf: replace CAT_OPTIONS correlated subselect with LATERAL JOIN in D…
jason-p-pickering Apr 24, 2026
6714820
Merge branch '2.40' into perf-cat-options-lateral-join-dxf2
jason-p-pickering Jul 20, 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
18 changes: 8 additions & 10 deletions ...ce-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/store/query/EventQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import lombok.RequiredArgsConstructor;
import org.hisp.dhis.dxf2.events.trackedentity.store.Function;
import org.hisp.dhis.dxf2.events.trackedentity.store.QueryElement;
import org.hisp.dhis.dxf2.events.trackedentity.store.Subselect;
import org.hisp.dhis.dxf2.events.trackedentity.store.TableColumn;

/**
Expand Down Expand Up @@ -71,15 +70,7 @@ public enum COLUMNS {
ORGUNIT_UID(new TableColumn("o", "uid", "ou_uid")),
ORGUNIT_NAME(new TableColumn("o", "name", "ou_name")),
COC_UID(new TableColumn("coc", "uid", "cocuid")),
CAT_OPTIONS(
new Subselect(
"( "
+ "SELECT string_agg(opt.uid::text, ',') "
+ "FROM dataelementcategoryoption opt "
+ "join categoryoptioncombos_categoryoptions ccc "
+ "on opt.categoryoptionid = ccc.categoryoptionid "
+ "WHERE coc.categoryoptioncomboid = ccc.categoryoptioncomboid )",
"catoptions")),
CAT_OPTIONS(new TableColumn("catopts", "catoptions")),
ASSIGNED_USER(new TableColumn("ui", "uid", "userid")),
ASSIGNED_USER_FIRST_NAME(new TableColumn("ui", "firstname")),
ASSIGNED_USER_SURNAME(new TableColumn("ui", "surname")),
Expand Down Expand Up @@ -118,6 +109,13 @@ public static String getQuery() {
+ "join organisationunit o on psi.organisationunitid = o.organisationunitid "
+ "join categoryoptioncombo coc on psi.attributeoptioncomboid = coc.categoryoptioncomboid "
+ "left join userinfo ui on psi.assigneduserid = ui.userinfoid "
+ "left join lateral ("
+ "select string_agg(opt.uid::text, ',') as catoptions "
+ "from dataelementcategoryoption opt "
+ "join categoryoptioncombos_categoryoptions ccc "
+ "on opt.categoryoptionid = ccc.categoryoptionid "
+ "where coc.categoryoptioncomboid = ccc.categoryoptioncomboid "
+ ") catopts on true "
+ "where pi.programinstanceid in (:ids)";
}

Expand Down
Loading