Merge pull request #5268 from dlubitz/90/bugfix/performance-find-pare…

…nt-node-aggregate

BUGFIX: Improve performance on find*Aggregates

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php

@@ -175,10 +175,9 @@ public function findNodeAggregateById(
  public function findParentNodeAggregates(
  NodeAggregateId $childNodeAggregateId
  ): NodeAggregates {
- $queryBuilder = $this->nodeQueryBuilder->buildBasicNodeAggregateQuery()
- ->innerJoin('n', $this->nodeQueryBuilder->tableNames->hierarchyRelation(), 'ch', 'ch.parentnodeanchor = n.relationanchorpoint')
- ->innerJoin('ch', $this->nodeQueryBuilder->tableNames->node(), 'cn', 'cn.relationanchorpoint = ch.childnodeanchor')
- ->andWhere('ch.contentstreamid = :contentStreamId')
+ $queryBuilder = $this->nodeQueryBuilder->buildParentNodeAggregateQuery()
+ ->innerJoin('h', $this->nodeQueryBuilder->tableNames->node(), 'cn', 'cn.relationanchorpoint = h.childnodeanchor')
+ ->andWhere('h.contentstreamid = :contentStreamId')
  ->andWhere('cn.nodeaggregateid = :nodeAggregateId')
  ->setParameters([
  'nodeAggregateId' => $childNodeAggregateId->value,

Neos.ContentGraph.DoctrineDbalAdapter/src/NodeQueryBuilder.php

@@ -56,12 +56,10 @@ public function buildChildNodeAggregateQuery(NodeAggregateId $parentNodeAggregat
  return $this->createQueryBuilder()
  ->select('cn.*, ch.contentstreamid, ch.subtreetags, cdsp.dimensionspacepoint AS covereddimensionspacepoint')
  ->from($this->tableNames->node(), 'pn')
- ->innerJoin('pn', $this->tableNames->hierarchyRelation(), 'ph', 'ph.childnodeanchor = pn.relationanchorpoint')
  ->innerJoin('pn', $this->tableNames->hierarchyRelation(), 'ch', 'ch.parentnodeanchor = pn.relationanchorpoint')
  ->innerJoin('ch', $this->tableNames->dimensionSpacePoints(), 'cdsp', 'cdsp.hash = ch.dimensionspacepointhash')
  ->innerJoin('ch', $this->tableNames->node(), 'cn', 'cn.relationanchorpoint = ch.childnodeanchor')
  ->where('pn.nodeaggregateid = :parentNodeAggregateId')
- ->andWhere('ph.contentstreamid = :contentStreamId')
  ->andWhere('ch.contentstreamid = :contentStreamId')
  ->orderBy('ch.position')
  ->setParameters([
@@ -70,6 +68,16 @@ public function buildChildNodeAggregateQuery(NodeAggregateId $parentNodeAggregat
  ]);
  }
 
+ public function buildParentNodeAggregateQuery(): QueryBuilder
+ {
+ return $this->createQueryBuilder()
+ ->select('n.*, h.contentstreamid, h.subtreetags, dsp.dimensionspacepoint AS covereddimensionspacepoint')
+ ->from($this->tableNames->node(), 'n')
+ ->innerJoin('n', $this->tableNames->hierarchyRelation(), 'h', 'h.parentnodeanchor = n.relationanchorpoint')
+ ->innerJoin('h', $this->tableNames->dimensionSpacePoints(), 'dsp', 'dsp.hash = h.dimensionspacepointhash')
+ ->where('h.contentstreamid = :contentStreamId');
+ }
+
  public function buildFindRootNodeAggregatesQuery(ContentStreamId $contentStreamId, FindRootNodeAggregatesFilter $filter): QueryBuilder
  {
  $queryBuilder = $this->buildBasicNodeAggregateQuery()