Skip to content

perf: Invert query for getDataYears #23982

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

Draft
jason-p-pickering wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −6
Draft

perf: Invert query for getDataYears #23982

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e97d39
Invert query for getDataYears
jason-p-pickering May 25, 2026
451d53a
Merge branch 'master' into DHIS2-21552
jason-p-pickering Jul 20, 2026
3a104d8
Merge branch 'master' into DHIS2-21552
jason-p-pickering Jul 24, 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
21 changes: 15 additions & 6 deletions ...vice-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,20 +702,29 @@ private List<Integer> getDataYears(AnalyticsTableUpdateParams params) {
replaceQualify(
sqlBuilder,
"""
select distinct(year) \
from ${datavalue} dv \
inner join analytics_rs_periodstructure pes on dv.periodid=pes.periodid \
select distinct(pes.year) \
from analytics_rs_periodstructure pes \
where pes.startdate is not null \
and dv.lastupdated < '${startTime}'\s""",
Map.of("startTime", toLongDate(params.getStartTime()))));
""",
Map.of()));

if (params.hasFromDate()) {
sql.append(
replace(
"and pes.startdate >= '${fromDate}'",
"and pes.startdate >= '${fromDate}' ",
Map.of("fromDate", DateUtils.toMediumDate(params.getFromDate()))));
}

sql.append(
replaceQualify(
sqlBuilder,
"""
and exists (select 1 from ${datavalue} dv \
where dv.periodid = pes.periodid \
and dv.lastupdated < '${startTime}')\
""",
Map.of("startTime", toLongDate(params.getStartTime()))));

return jdbcTemplate.queryForList(sql.toString(), Integer.class);
}

Expand Down
Loading