Skip to content

Fix(Core): Optimize containers tabs computation when many entities are active - #1348

Merged
Herafia merged 3 commits into
pluginsGLPI:11.0/bugfixesfrom
cgrard:fix/getentries-performance
Nov 20, 2026
Merged

Herafia merged 3 commits into
pluginsGLPI:11.0/bugfixesfrom
cgrard:fix/getentries-performance

Conversation

@cgrard

@cgrard cgrard commented Nov 12, 2026

Copy link
Copy Markdown

Checklist before requesting a review

  • I have performed a self-review of my code.
  • I have added tests (when available) that prove my fix is effective or that my feature works.
  • I have updated the CHANGELOG with a short functional description of the fix or new feature.

Description

Changes:

  • entity visibility is computed once per entity (containers usually share a few entities), with a key-based intersection;
  • the rights of the active profile on all entity-visible containers are read in a single query, with the new PluginFieldsProfile::getRightsOnContainers();
  • PluginFieldsProfile::getRightOnContainer() now relies on getRightsOnContainers(), so the rights query exists only once.

The behaviour is unchanged: same entity rule, same MAX(right) per container and profile, a container without right (no row, NULL or 0) is still skipped, and the cron / no active profile cases still return no entry.

On an instance with 22 containers on the root entity and 5591 entities, getEntries() goes from about 47 ms to about 2 ms, with identical results for 39 user/profile combinations and for getRightOnContainer() on 700 profile × container pairs.

New tests in tests/Units/ContainerGetEntriesTest.php cover profile rights (none, read, create), recursive and non recursive containers seen from a child entity, the no active profile case, and the equivalence of getRightsOnContainers() with getRightOnContainer().

Comment thread inc/container.class.php Resolved
@cgrard

cgrard commented Nov 13, 2026

Copy link
Copy Markdown
Author

Thanks, applied: the cron / no active profile check now runs before the entity loop. I also fixed the Rector findings that made the CI fail.

…e active

getEntries() is called on every request. It checked the entity visibility
and the profile right container by container. Compute visibility once per
entity, and read the rights of all visible containers in a single query.
@cgrard
cgrard force-pushed the fix/getentries-performance branch from 1347d5f to a6ea589 Compare November 18, 2026 16:05
@Rom1-B
Rom1-B requested review from a team, Herafia, Lainow and jdurand-teclib and removed request for a team November 19, 2026 07:03
Rom1-B
Rom1-B previously approved these changes Nov 19, 2026
Lainow
Lainow previously approved these changes Nov 19, 2026
@Rom1-B
Rom1-B dismissed stale reviews from Lainow and themself via 89a6487 November 19, 2026 15:19
@Rom1-B
Rom1-B requested a review from Lainow November 19, 2026 15:19
@Herafia
Herafia merged commit cacf687 into pluginsGLPI:11.0/bugfixes Nov 20, 2026
7 checks passed
@glpi-project

glpi-project Bot commented Nov 20, 2026 •

Copy link
Copy Markdown
Contributor

Backport-action backported this pull request in workflow run 44730513604.

Target Status
main ⚠️ Drafted with conflicts #1365

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Slow page loads with many entities: getEntries() checks entities and rights container by container on every request

5 participants