TASK: Early termination of findDescendantNodes with limit1

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

@@ -474,10 +474,10 @@
             $this->nodeQueryBuilder->addNodeTypeCriteria($queryBuilder, ExpandedNodeTypeCriteria::create($filter->nodeTypes, $this->nodeTypeManager));
         }
         if ($filter->searchTerm !== null) {
-            $this->nodeQueryBuilder->addSearchTermConstraints($queryBuilder, $filter->searchTerm);
+            $queryBuilder->andWhere($this->nodeQueryBuilder->addSearchTermConstraints($queryBuilder, $filter->searchTerm));
         }
         if ($filter->propertyValue !== null) {
-            $this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilder, $filter->propertyValue);
+            $queryBuilder->andWhere($this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilder, $filter->propertyValue));
         }
         $this->addSubtreeTagConstraints($queryBuilder);
         return $queryBuilder;
@@ -505,16 +505,16 @@
             $this->nodeQueryBuilder->addNodeTypeCriteria($queryBuilder, ExpandedNodeTypeCriteria::create($filter->nodeTypes, $this->nodeTypeManager), "{$destinationTablePrefix}n");
         }
         if ($filter->nodeSearchTerm !== null) {
-            $this->nodeQueryBuilder->addSearchTermConstraints($queryBuilder, $filter->nodeSearchTerm, "{$destinationTablePrefix}n");
+            $queryBuilder->andWhere($this->nodeQueryBuilder->addSearchTermConstraints($queryBuilder, $filter->nodeSearchTerm, "{$destinationTablePrefix}n"));
         }
         if ($filter->nodePropertyValue !== null) {
-            $this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilder, $filter->nodePropertyValue, "{$destinationTablePrefix}n");
+            $queryBuilder->andWhere($this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilder, $filter->nodePropertyValue, "{$destinationTablePrefix}n"));
         }
         if ($filter->referenceSearchTerm !== null) {
-            $this->nodeQueryBuilder->addSearchTermConstraints($queryBuilder, $filter->referenceSearchTerm, 'r');
+            $queryBuilder->andWhere($this->nodeQueryBuilder->addSearchTermConstraints($queryBuilder, $filter->referenceSearchTerm, 'r'));
         }
         if ($filter->referencePropertyValue !== null) {
-            $this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilder, $filter->referencePropertyValue, 'r');
+            $queryBuilder->andWhere($this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilder, $filter->referencePropertyValue, 'r'));
         }
         if ($filter->referenceName !== null) {
             $queryBuilder->andWhere('r.name = :referenceName')->setParameter('referenceName', $filter->referenceName->value);
@@ -543,10 +543,10 @@
             $this->nodeQueryBuilder->addNodeTypeCriteria($queryBuilder, ExpandedNodeTypeCriteria::create($filter->nodeTypes, $this->nodeTypeManager));
         }
         if ($filter->searchTerm !== null) {
-            $this->nodeQueryBuilder->addSearchTermConstraints($queryBuilder, $filter->searchTerm);
+            $queryBuilder->andWhere($this->nodeQueryBuilder->addSearchTermConstraints($queryBuilder, $filter->searchTerm));
         }
         if ($filter->propertyValue !== null) {
-            $this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilder, $filter->propertyValue);
+            $queryBuilder->andWhere($this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilder, $filter->propertyValue));
         }
         if ($filter->pagination !== null) {
             $this->applyPagination($queryBuilder, $filter->pagination);
@@ -595,9 +595,20 @@
      */
     private function buildDescendantNodesQueries(NodeAggregateId $entryNodeAggregateId, FindDescendantNodesFilter|CountDescendantNodesFilter $filter): array
     {
-        $queryBuilderInitial = $this->createQueryBuilder()
+        $queryBuilderInitial = $this->createQueryBuilder();
+
+        // todo optimise also if ordering is ASC
+        $optimize = $filter->pagination !== null && $filter->pagination->limit === 1 && $filter->pagination->offset === 0 && $filter->ordering === null;
+
+        $nodeMatcher = (string)$queryBuilderInitial->expr()->and(...(array_filter([
+            $filter->nodeTypes !== null ? $this->nodeQueryBuilder->addNodeTypeCriteria2($queryBuilderInitial, ExpandedNodeTypeCriteria::create($filter->nodeTypes, $this->nodeTypeManager)) : '',
+            $filter->searchTerm !== null ? $this->nodeQueryBuilder->addSearchTermConstraints($queryBuilderInitial, $filter->searchTerm) : '',
+            $filter->propertyValue !== null ? $this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilderInitial, $filter->propertyValue) : '',
+        ]) ?: ['true'])); // todo empty true case
+
+        $queryBuilderInitial
             // @see https://mariadb.com/kb/en/library/recursive-common-table-expressions-overview/#cast-to-avoid-data-truncation
-            ->select('n.*, h.subtreetags, CAST("ROOT" AS CHAR(50)) AS parentNodeAggregateId, 0 AS level, 0 AS position')
+            ->select('n.*, h.subtreetags, CAST("ROOT" AS CHAR(50)) AS parentNodeAggregateId, 0 AS level, 0 AS position' . ($optimize ? ", CASE WHEN $nodeMatcher THEN 1 ELSE 0 END AS isMatch" : ''))
             ->from($this->nodeQueryBuilder->tableNames->node(), 'n')
             // we need to join with the hierarchy relation, because we need the node name.
             ->innerJoin('n', $this->nodeQueryBuilder->tableNames->hierarchyRelation(), 'h', 'h.childnodeanchor = n.relationanchorpoint')
@@ -610,24 +621,40 @@
             ->andWhere('p.nodeaggregateid = :entryNodeAggregateId');
         $this->addSubtreeTagConstraints($queryBuilderInitial);
 
+        $nodeMatcher = (string)$queryBuilderInitial->expr()->and(...(array_filter([
+            $filter->nodeTypes !== null ? $this->nodeQueryBuilder->addNodeTypeCriteria2($queryBuilderInitial, ExpandedNodeTypeCriteria::create($filter->nodeTypes, $this->nodeTypeManager), 'cn') : '',
+            $filter->searchTerm !== null ? $this->nodeQueryBuilder->addSearchTermConstraints($queryBuilderInitial, $filter->searchTerm, 'cn') : '',
+            $filter->propertyValue !== null ? $this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilderInitial, $filter->propertyValue, 'cn') : '',
+        ]) ?: ['true']));
+
         $queryBuilderRecursive = $this->createQueryBuilder()
-            ->select('cn.*, h.subtreetags, pn.nodeaggregateid AS parentNodeAggregateId, pn.level + 1 AS level, h.position')
+            ->select('cn.*, h.subtreetags, pn.nodeaggregateid AS parentNodeAggregateId, pn.level + 1 AS level, h.position' . ($optimize ? ", CASE WHEN $nodeMatcher THEN 1 ELSE 0 END AS isMatch" : ''))
             ->from('tree', 'pn')
             ->innerJoin('pn', $this->nodeQueryBuilder->tableNames->hierarchyRelation(), 'h', 'h.parentnodeanchor = pn.relationanchorpoint')
             ->innerJoin('pn', $this->nodeQueryBuilder->tableNames->node(), 'cn', 'cn.relationanchorpoint = h.childnodeanchor')
             ->where('h.contentstreamid = :contentStreamId')
             ->andWhere('h.dimensionspacepointhash = :dimensionSpacePointHash');
+
+        if ($optimize) {
+            $queryBuilderRecursive->andWhere('pn.isMatch = 0');
+        }
+
         $this->addSubtreeTagConstraints($queryBuilderRecursive);
 
         $queryBuilderCte = $this->nodeQueryBuilder->buildBasicNodesCteQuery($entryNodeAggregateId, $this->contentStreamId, $this->dimensionSpacePoint, 'tree', 'n');
-        if ($filter->nodeTypes !== null) {
-            $this->nodeQueryBuilder->addNodeTypeCriteria($queryBuilderCte, ExpandedNodeTypeCriteria::create($filter->nodeTypes, $this->nodeTypeManager));
-        }
-        if ($filter->searchTerm !== null) {
-            $this->nodeQueryBuilder->addSearchTermConstraints($queryBuilderCte, $filter->searchTerm);
-        }
-        if ($filter->propertyValue !== null) {
-            $this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilderCte, $filter->propertyValue);
+
+        if ($optimize === false) {
+            if ($filter->nodeTypes !== null) {
+                $this->nodeQueryBuilder->addNodeTypeCriteria($queryBuilderCte, ExpandedNodeTypeCriteria::create($filter->nodeTypes, $this->nodeTypeManager));
+            }
+            if ($filter->searchTerm !== null && $filter->searchTerm !== '') {
+                $queryBuilderCte->andWhere($this->nodeQueryBuilder->addSearchTermConstraints($queryBuilderCte, $filter->searchTerm));
+            }
+            if ($filter->propertyValue !== null) {
+                $queryBuilderCte->andWhere($this->nodeQueryBuilder->addPropertyValueConstraints($queryBuilderCte, $filter->propertyValue));
+            }
+        } else {
+            $queryBuilderCte->where('n.isMatch = 1');
         }
         return compact('queryBuilderInitial', 'queryBuilderRecursive', 'queryBuilderCte');
     }

Neos.ContentGraph.DoctrineDbalAdapter/src/NodeQueryBuilder.php

@@ -186,25 +186,51 @@
         }
     }
 
-    public function addSearchTermConstraints(QueryBuilder $queryBuilder, SearchTerm $searchTerm, string $nodeTableAlias = 'n'): void
+    // todo combine with above
+    public function addNodeTypeCriteria2(QueryBuilder $queryBuilder, ExpandedNodeTypeCriteria $constraintsWithSubNodeTypes, string $nodeTableAlias = 'n'): string
     {
-        if ($searchTerm->term === '') {
-            return;
+        $nodeTablePrefix = $nodeTableAlias === '' ? '' : $nodeTableAlias . '.';
+        $allowanceQueryPart = '';
+        if (!$constraintsWithSubNodeTypes->explicitlyAllowedNodeTypeNames->isEmpty()) {
+            $allowanceQueryPart = $queryBuilder->expr()->in($nodeTablePrefix . 'nodetypename', ':explicitlyAllowedNodeTypeNames');
+            $queryBuilder->setParameter('explicitlyAllowedNodeTypeNames', $constraintsWithSubNodeTypes->explicitlyAllowedNodeTypeNames->toStringArray(), ArrayParameterType::STRING);
+        }
+        $denyQueryPart = '';
+        if (!$constraintsWithSubNodeTypes->explicitlyDisallowedNodeTypeNames->isEmpty()) {
+            $denyQueryPart = $queryBuilder->expr()->notIn($nodeTablePrefix . 'nodetypename', ':explicitlyDisallowedNodeTypeNames');
+            $queryBuilder->setParameter('explicitlyDisallowedNodeTypeNames', $constraintsWithSubNodeTypes->explicitlyDisallowedNodeTypeNames->toStringArray(), ArrayParameterType::STRING);
+        }
+        if ($allowanceQueryPart && $denyQueryPart) {
+            if ($constraintsWithSubNodeTypes->isWildCardAllowed) {
+                return (string)$queryBuilder->expr()->or($allowanceQueryPart, $denyQueryPart);
+            } else {
+                return (string)$queryBuilder->expr()->and($allowanceQueryPart, $denyQueryPart);
+            }
+        } elseif ($allowanceQueryPart && !$constraintsWithSubNodeTypes->isWildCardAllowed) {
+            return $allowanceQueryPart;
+        } elseif ($denyQueryPart) {
+            return $denyQueryPart;
         }
-        $queryBuilder->andWhere('JSON_SEARCH(' . $nodeTableAlias . '.properties, "one", :searchTermPattern, NULL, "$.*.value") IS NOT NULL')->setParameter('searchTermPattern', '%' . $searchTerm->term . '%');
+        throw new \RuntimeException(sprintf('NO'), 1736614392);
+        return '';
     }
 
-    public function addPropertyValueConstraints(QueryBuilder $queryBuilder, PropertyValueCriteriaInterface $propertyValue, string $nodeTableAlias = 'n'): void
+    public function addSearchTermConstraints(QueryBuilder $queryBuilder, SearchTerm $searchTerm, string $nodeTableAlias = 'n'): string
     {
-        $queryBuilder->andWhere($this->propertyValueConstraints($queryBuilder, $propertyValue, $nodeTableAlias));
+        if ($searchTerm->term === '') {
+            throw new \RuntimeException(sprintf('NO'), 1736614392);
+            return '';
+        }
+        $queryBuilder->setParameter('searchTermPattern', '%' . $searchTerm->term . '%');
+        return 'JSON_SEARCH(' . $nodeTableAlias . '.properties, "one", :searchTermPattern, NULL, "$.*.value") IS NOT NULL';
     }
 
-    private function propertyValueConstraints(QueryBuilder $queryBuilder, PropertyValueCriteriaInterface $propertyValue, string $nodeTableAlias): string
+    public function addPropertyValueConstraints(QueryBuilder $queryBuilder, PropertyValueCriteriaInterface $propertyValue, string $nodeTableAlias = 'n'): string
     {
         return match ($propertyValue::class) {
-            AndCriteria::class => (string)$queryBuilder->expr()->and($this->propertyValueConstraints($queryBuilder, $propertyValue->criteria1, $nodeTableAlias), $this->propertyValueConstraints($queryBuilder, $propertyValue->criteria2, $nodeTableAlias)),
-            NegateCriteria::class => 'NOT (' . $this->propertyValueConstraints($queryBuilder, $propertyValue->criteria, $nodeTableAlias) . ')',
-            OrCriteria::class => (string)$queryBuilder->expr()->or($this->propertyValueConstraints($queryBuilder, $propertyValue->criteria1, $nodeTableAlias), $this->propertyValueConstraints($queryBuilder, $propertyValue->criteria2, $nodeTableAlias)),
+            AndCriteria::class => (string)$queryBuilder->expr()->and($this->addPropertyValueConstraints($queryBuilder, $propertyValue->criteria1, $nodeTableAlias), $this->addPropertyValueConstraints($queryBuilder, $propertyValue->criteria2, $nodeTableAlias)),
+            NegateCriteria::class => 'NOT (' . $this->addPropertyValueConstraints($queryBuilder, $propertyValue->criteria, $nodeTableAlias) . ')',
+            OrCriteria::class => (string)$queryBuilder->expr()->or($this->addPropertyValueConstraints($queryBuilder, $propertyValue->criteria1, $nodeTableAlias), $this->addPropertyValueConstraints($queryBuilder, $propertyValue->criteria2, $nodeTableAlias)),
             PropertyValueContains::class => $this->searchPropertyValueStatement($queryBuilder, $propertyValue->propertyName, '%' . $propertyValue->value . '%', $nodeTableAlias, $propertyValue->caseSensitive),
             PropertyValueEndsWith::class => $this->searchPropertyValueStatement($queryBuilder, $propertyValue->propertyName, '%' . $propertyValue->value, $nodeTableAlias, $propertyValue->caseSensitive),
             PropertyValueEquals::class => is_string($propertyValue->value) ? $this->searchPropertyValueStatement($queryBuilder, $propertyValue->propertyName, $propertyValue->value, $nodeTableAlias, $propertyValue->caseSensitive) : $this->comparePropertyValueStatement($queryBuilder, $propertyValue->propertyName, $propertyValue->value, '=', $nodeTableAlias),