Skip to content

Optimze DQL cache usage in NestedTreeRepository #3011

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Optimze DQL cache usage in NestedTreeRepository #3011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ a release.
---

## [Unreleased]
### Fixed
- Tree: Optimize DQL cache usage and prevent memory leaks by using parameterized queries in NestedTreeRepository

## [3.21.0] - 2025-09-22
### Added
Expand Down
47 changes: 29 additions & 18 deletions src/Tree/Entity/Repository/NestedTreeRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,15 @@ public function getPathQueryBuilder($node/* , array $options = [] */) // @phpsta
->orderBy('node.'.$config['left'], 'ASC')
;
if ($options['includeNode']) {
$qb->where($qb->expr()->lte('node.'.$config['left'], $left))
->andWhere($qb->expr()->gte('node.'.$config['right'], $right));
$qb->where($qb->expr()->lte('node.'.$config['left'], ':left'))
->andWhere($qb->expr()->gte('node.'.$config['right'], ':right'));
} else {
$qb->where($qb->expr()->lt('node.'.$config['left'], $left))
->andWhere($qb->expr()->gt('node.'.$config['right'], $right));
$qb->where($qb->expr()->lt('node.'.$config['left'], ':left'))
->andWhere($qb->expr()->gt('node.'.$config['right'], ':right'));
}
$qb->setParameter('left', $left);
$qb->setParameter('right', $right);

if (isset($config['root'])) {
$rootId = $wrapped->getPropertyValue($config['root']);
$qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':rid'));
Expand Down Expand Up @@ -259,8 +262,10 @@ public function childrenQueryBuilder($node = null, $direct = false, $sortByField
$left = $wrapped->getPropertyValue($config['left']);
$right = $wrapped->getPropertyValue($config['right']);
if ($left && $right) {
$qb->where($qb->expr()->lt('node.'.$config['right'], $right));
$qb->andWhere($qb->expr()->gt('node.'.$config['left'], $left));
$qb->where($qb->expr()->lt('node.'.$config['right'], ':right'));
$qb->andWhere($qb->expr()->gt('node.'.$config['left'], ':left'));
$qb->setParameter('left', $left);
$qb->setParameter('right', $right);
}
}
if (isset($config['root'])) {
Expand Down Expand Up @@ -470,11 +475,12 @@ public function getNextSiblingsQueryBuilder($node, $includeSelf = false)
$qb->select('node')
->from($config['useObjectClass'], 'node')
->where($includeSelf ?
$qb->expr()->gte('node.'.$config['left'], $left) :
$qb->expr()->gt('node.'.$config['left'], $left)
$qb->expr()->gte('node.'.$config['left'], ':left') :
$qb->expr()->gt('node.'.$config['left'], ':left')
)
->orderBy("node.{$config['left']}", 'ASC')
;
$qb->setParameter('left', $left);
if ($parent) {
$wrappedParent = new EntityWrapper($parent, $this->getEntityManager());
$qb->andWhere($qb->expr()->eq('node.'.$config['parent'], ':pid'));
Expand Down Expand Up @@ -550,11 +556,12 @@ public function getPrevSiblingsQueryBuilder($node, $includeSelf = false)
$qb->select('node')
->from($config['useObjectClass'], 'node')
->where($includeSelf ?
$qb->expr()->lte('node.'.$config['left'], $left) :
$qb->expr()->lt('node.'.$config['left'], $left)
$qb->expr()->lte('node.'.$config['left'], ':left') :
$qb->expr()->lt('node.'.$config['left'], ':left')
)
->orderBy("node.{$config['left']}", 'ASC')
;
$qb->setParameter('left', $left);
if ($parent) {
$wrappedParent = new EntityWrapper($parent, $this->getEntityManager());
$qb->andWhere($qb->expr()->eq('node.'.$config['parent'], ':pid'));
Expand Down Expand Up @@ -923,10 +930,10 @@ public function recoverFast(array $options = []): void
$em = $this->getEntityManager();

$updateQb = $em->createQueryBuilder()
->update($meta->getName(), 'node')
->set('node.'.$config['left'], ':left')
->set('node.'.$config['right'], ':right')
->where('node.id = :id');
->update($meta->getName(), 'node')
->set('node.'.$config['left'], ':left')
->set('node.'.$config['right'], ':right')
->where('node.id = :id');
if (isset($config['level'])) {
$updateQb->set('node.'.$config['level'], ':level');
}
Expand Down Expand Up @@ -1223,10 +1230,12 @@ private function verifyTree(array &$errors, ?object $root = null): void
$qb->select($qb->expr()->count('node.'.$identifier))
->from($config['useObjectClass'], 'node')
->where($qb->expr()->orX(
$qb->expr()->eq('node.'.$config['left'], $i),
$qb->expr()->eq('node.'.$config['right'], $i)
$qb->expr()->eq('node.'.$config['left'], ':left'),
$qb->expr()->eq('node.'.$config['right'], ':right')
))
;
$qb->setParameter('left', $i);
$qb->setParameter('right', $i);
if (isset($config['root'])) {
$qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':rid'));
$qb->setParameter('rid', $rootId);
Expand Down Expand Up @@ -1337,9 +1346,11 @@ private function verifyTree(array &$errors, ?object $root = null): void
$qb = $this->getQueryBuilder();
$qb->select($qb->expr()->count('node.'.$identifier))
->from($config['useObjectClass'], 'node')
->where($qb->expr()->lt('node.'.$config['left'], $left))
->andWhere($qb->expr()->gt('node.'.$config['right'], $right))
->where($qb->expr()->lt('node.'.$config['left'], ':left'))
->andWhere($qb->expr()->gt('node.'.$config['right'], ':right'))
;
$qb->setParameter('left', $left);
$qb->setParameter('right', $right);
if (isset($config['root'])) {
$qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':rid'));
$qb->setParameter('rid', $rootId);
Expand Down