Skip to content

fix: data export - replace O(n²) org unit descendants cross-join with path index scan [DHIS2-21490] #23880

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

Merged
jbee merged 2 commits into from
May 12, 2026
Merged

fix: data export - replace O(n²) org unit descendants cross-join with path index scan [DHIS2-21490] #23880

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
7ab447f
fix: SQL to add children for all direct matches
jbee May 12, 2026
4074210
fix: unit test assert
jbee May 12, 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
7 changes: 3 additions & 4 deletions ...ervice-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataExportStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,9 @@ ou_ids AS (
),
ou_with_descendants_ids AS (
SELECT DISTINCT ou.organisationunitid
FROM organisationunit ou
LEFT JOIN organisationunit parent_ou ON (ou.path LIKE parent_ou.path || '%')
WHERE ou.organisationunitid IN (SELECT organisationunitid FROM ou_ids)
OR parent_ou.organisationunitid IN (SELECT organisationunitid FROM ou_ids)
FROM ou_ids
JOIN organisationunit root USING (organisationunitid)
JOIN organisationunit ou ON ou.path LIKE root.path || '%'
)
SELECT
de.uid AS deid,
Expand Down
14 changes: 6 additions & 8 deletions ...vice-core/src/test/java/org/hisp/dhis/datavalue/hibernate/DataExportQueryBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,9 @@ ou_ids AS (
),
ou_with_descendants_ids AS (
SELECT DISTINCT ou.organisationunitid
FROM organisationunit ou
LEFT JOIN organisationunit parent_ou ON (ou.path LIKE parent_ou.path || '%')
WHERE ou.organisationunitid IN (SELECT organisationunitid FROM ou_ids)
OR parent_ou.organisationunitid IN (SELECT organisationunitid FROM ou_ids)
FROM ou_ids
JOIN organisationunit root USING (organisationunitid)
JOIN organisationunit ou ON ou.path LIKE root.path || '%'
)
SELECT
de.uid AS deid,
Expand Down Expand Up @@ -391,10 +390,9 @@ ou_ids AS (
),
ou_with_descendants_ids AS (
SELECT DISTINCT ou.organisationunitid
FROM organisationunit ou
LEFT JOIN organisationunit parent_ou ON (ou.path LIKE parent_ou.path || '%')
WHERE ou.organisationunitid IN (SELECT organisationunitid FROM ou_ids)
OR parent_ou.organisationunitid IN (SELECT organisationunitid FROM ou_ids)
FROM ou_ids
JOIN organisationunit root USING (organisationunitid)
JOIN organisationunit ou ON ou.path LIKE root.path || '%'
)
SELECT
de.uid AS deid,
Expand Down
Loading