Skip to content

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

Open
cgrard wants to merge 2 commits into
pluginsGLPI:11.0/bugfixesfrom
cgrard:fix/getentries-performance
Open

cgrard wants to merge 2 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().

…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.
Comment thread inc/container.class.php Outdated
Comment on lines +1583 to +1612
// First pass: entity restriction. Visibility is computed once per entity instead of
// once per container, as getSonsOf() of a high level entity can be thousands of rows.
$visible = [];
$active_entities = null;
$visible_by_entity = [];
foreach ($found as $item) {
//entities restriction
if (!in_array($item['entities_id'], $_SESSION['glpiactiveentities'])) {
$active_entities ??= array_flip($_SESSION['glpiactiveentities']);
if (!isset($active_entities[(int) $item['entities_id']])) {
if ($item['is_recursive'] == 1) {
$entities = getSonsOf('glpi_entities', $item['entities_id']);
if (array_intersect($entities, $_SESSION['glpiactiveentities']) === []) {
$visible_by_entity[$item['entities_id']] ??= array_intersect_key(
array_flip(getSonsOf('glpi_entities', $item['entities_id'])),
$active_entities,
) !== [];
if (!$visible_by_entity[$item['entities_id']]) {
continue;
}
} else {
continue;
}
}
$visible[$item['id']] = $item;
}

if (Session::isCron() || !isset($_SESSION['glpiactiveprofile']['id'])) {
continue;
}
if (
$visible === []
|| Session::isCron()
|| !isset($_SESSION['glpiactiveprofile']['id'])
|| $_SESSION['glpiactiveprofile']['id'] == null
) {
return $itemtypes;

@Rom1-B Rom1-B Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the cron / no profile check moves before the entity loop, those requests skip getSonsOf() entirely and the lazy ??= goes away:

Suggested change
// First pass: entity restriction. Visibility is computed once per entity instead of
// once per container, as getSonsOf() of a high level entity can be thousands of rows.
$visible = [];
$active_entities = null;
$visible_by_entity = [];
foreach ($found as $item) {
//entities restriction
if (!in_array($item['entities_id'], $_SESSION['glpiactiveentities'])) {
$active_entities ??= array_flip($_SESSION['glpiactiveentities']);
if (!isset($active_entities[(int) $item['entities_id']])) {
if ($item['is_recursive'] == 1) {
$entities = getSonsOf('glpi_entities', $item['entities_id']);
if (array_intersect($entities, $_SESSION['glpiactiveentities']) === []) {
$visible_by_entity[$item['entities_id']] ??= array_intersect_key(
array_flip(getSonsOf('glpi_entities', $item['entities_id'])),
$active_entities,
) !== [];
if (!$visible_by_entity[$item['entities_id']]) {
continue;
}
} else {
continue;
}
}
$visible[$item['id']] = $item;
}
if (Session::isCron() || !isset($_SESSION['glpiactiveprofile']['id'])) {
continue;
}
if (
$visible === []
|| Session::isCron()
|| !isset($_SESSION['glpiactiveprofile']['id'])
|| $_SESSION['glpiactiveprofile']['id'] == null
) {
return $itemtypes;
if (
$found === []
|| Session::isCron()
|| !isset($_SESSION['glpiactiveprofile']['id'])
|| $_SESSION['glpiactiveprofile']['id'] == null
) {
return $itemtypes;
}
// First pass: entity restriction. Visibility is computed once per entity instead of
// once per container, as getSonsOf() of a high level entity can be thousands of rows.
$visible = [];
$active_entities = array_flip($_SESSION['glpiactiveentities']);
$visible_by_entity = [];
foreach ($found as $item) {
if (!isset($active_entities[(int) $item['entities_id']])) {
if ($item['is_recursive'] == 1) {
$visible_by_entity[$item['entities_id']] ??= array_intersect_key(
array_flip(getSonsOf('glpi_entities', $item['entities_id'])),
$active_entities,
) !== [];
if (!$visible_by_entity[$item['entities_id']]) {
continue;
}
} else {
continue;
}
}
$visible[$item['id']] = $item;

@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.

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.

2 participants