!!! TASK: Declare ProjectionService as api to reset projections instead of ContentRepository

Neos.ContentRepository.BehavioralTests/Classes/Command/PerformanceMeasurementService.php

@@ -32,6 +32,7 @@
 use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated;
 use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateRootWorkspace;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
+use Neos\ContentRepository\Core\Projection\Projections;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
@@ -53,7 +54,8 @@ public function __construct(
         private readonly EventPersister $eventPersister,
         private readonly ContentRepository $contentRepository,
         private readonly Connection $connection,
-        private readonly ContentRepositoryId $contentRepositoryId
+        private readonly ContentRepositoryId $contentRepositoryId,
+        private readonly Projections $projections,
     ) {
         $this->contentStreamId = contentStreamId::fromString('cs-identifier');
         $this->workspaceName = WorkspaceName::fromString('some-workspace');
@@ -74,7 +76,7 @@ public function removeEverything(): void
     {
         $eventTableName = DoctrineEventStoreFactory::databaseTableName($this->contentRepositoryId);
         $this->connection->executeStatement('TRUNCATE ' . $this->connection->quoteIdentifier($eventTableName));
-        $this->contentRepository->resetProjectionStates();
+        $this->projections->resetAll();
     }
 
     public function createNodesForPerformanceTest(int $nodesPerLevel, int $levels): void
@@ -96,7 +98,7 @@ public function createNodesForPerformanceTest(int $nodesPerLevel, int $levels):
             NodeAggregateClassification::CLASSIFICATION_ROOT,
         );
 
-        $this->eventPersister->publishEvents(new EventsToPublish(
+        $this->eventPersister->publishEvents($this->contentRepository, new EventsToPublish(
             $this->contentStreamEventStream->getEventStreamName(),
             Events::with($rootNodeAggregateWasCreated),
             ExpectedVersion::ANY()
@@ -106,7 +108,7 @@ public function createNodesForPerformanceTest(int $nodesPerLevel, int $levels):
         $sumSoFar = 0;
         $events = [];
         $this->createHierarchy($rootNodeAggregateId, 1, $levels, $nodesPerLevel, $sumSoFar, $events);
-        $this->eventPersister->publishEvents(new EventsToPublish(
+        $this->eventPersister->publishEvents($this->contentRepository, new EventsToPublish(
             $this->contentStreamEventStream->getEventStreamName(),
             Events::fromArray($events),
             ExpectedVersion::ANY()

Neos.ContentRepository.BehavioralTests/Classes/Command/PerformanceMeasurementServiceFactory.php

@@ -36,7 +36,8 @@ public function build(
             $serviceFactoryDependencies->eventPersister,
             $serviceFactoryDependencies->contentRepository,
             $this->connection,
-            $serviceFactoryDependencies->contentRepositoryId
+            $serviceFactoryDependencies->contentRepositoryId,
+            $serviceFactoryDependencies->projections,
         );
     }
 }

Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php

@@ -18,7 +18,6 @@
 use Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\Dto\TraceEntryType;
 use Neos\ContentRepository\Core\EventStore\EventInterface;
 use Neos\ContentRepository\Core\Projection\CatchUpHookInterface;
-use Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger\SubprocessProjectionCatchUpTrigger;
 use Neos\EventStore\Model\EventEnvelope;
 use Neos\Flow\Annotations as Flow;
 

Neos.ContentRepository.BehavioralTests/Classes/TestSuite/Behavior/CRBehavioralTestsSubjectProvider.php

@@ -18,6 +18,8 @@
 use Behat\Gherkin\Node\TableNode;
 use Doctrine\DBAL\Connection;
 use Neos\ContentRepository\Core\ContentRepository;
+use Neos\ContentRepository\Core\Service\ProjectionService;
+use Neos\ContentRepository\Core\Service\ProjectionServiceFactory;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Helpers\GherkinTableNodeBasedContentDimensionSource;
 use Neos\EventStore\EventStoreInterface;
@@ -179,7 +181,9 @@ protected function setUpContentRepository(ContentRepositoryId $contentRepository
         $databaseConnection = (new \ReflectionClass($eventStore))->getProperty('connection')->getValue($eventStore);
         $eventTableName = sprintf('cr_%s_events', $contentRepositoryId->value);
         $databaseConnection->executeStatement('TRUNCATE ' . $eventTableName);
-        $contentRepository->resetProjectionStates();
+        /** @var ProjectionService $projectionService */
+        $projectionService = $this->contentRepositoryRegistry->buildService($contentRepositoryId, $this->getObject(ProjectionServiceFactory::class));
+        $projectionService->resetAllProjections();
 
         return $contentRepository;
     }

Neos.ContentRepository.Core/Classes/CommandHandlingDependencies.php

@@ -16,6 +16,8 @@
 
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
 use Neos\ContentRepository\Core\CommandHandler\CommandResult;
+use Neos\ContentRepository\Core\EventStore\EventPersister;
+use Neos\ContentRepository\Core\EventStore\EventsToPublish;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentStream\ContentStreamFinder;
 use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder;
@@ -37,15 +39,22 @@ final class CommandHandlingDependencies
      */
     private array $overridenContentGraphInstances = [];
 
-    public function __construct(private readonly ContentRepository $contentRepository)
-    {
+    public function __construct(
+        private readonly ContentRepository $contentRepository,
+        private readonly EventPersister $eventPersister
+    ) {
     }
 
     public function handle(CommandInterface $command): CommandResult
     {
         return $this->contentRepository->handle($command);
     }
 
+    public function publishEvents(EventsToPublish $eventsToPublish): void
+    {
+        $this->eventPersister->publishEvents($this->contentRepository, $eventsToPublish);
+    }
+
     public function getWorkspaceFinder(): WorkspaceFinder
     {
         return $this->contentRepository->getWorkspaceFinder();

Neos.ContentRepository.Core/Classes/ContentRepository.php

@@ -87,7 +87,7 @@ public function __construct(
         private readonly UserIdProviderInterface $userIdProvider,
         private readonly ClockInterface $clock,
     ) {
-        $this->commandHandlingDependencies = new CommandHandlingDependencies($this);
+        $this->commandHandlingDependencies = new CommandHandlingDependencies($this, $eventPersister);
     }
 
     /**
@@ -131,7 +131,7 @@ public function handle(CommandInterface $command): CommandResult
             $eventsToPublish->expectedVersion,
         );
 
-        return $this->eventPersister->publishEvents($eventsToPublish);
+        return $this->eventPersister->publishEvents($this, $eventsToPublish);
     }
 
 
@@ -200,6 +200,15 @@ public function catchUpProjection(string $projectionClassName, CatchUpOptions $o
         $catchUpHook?->onAfterCatchUp();
     }
 
+    public function catchupProjections(): void
+    {
+        foreach ($this->projectionsAndCatchUpHooks->projections as $projection) {
+            // FIXME optimise by only loading required events once and not per projection
+            // see https://github.com/neos/neos-development-collection/pull/4988/
+            $this->catchUpProjection($projection::class, CatchUpOptions::create());
+        }
+    }
+
     public function setUp(): void
     {
         $this->eventStore->setup();

Neos.ContentRepository.Core/Classes/EventStore/EventPersister.php

@@ -5,10 +5,7 @@
 namespace Neos\ContentRepository\Core\EventStore;
 
 use Neos\ContentRepository\Core\CommandHandler\CommandResult;
-use Neos\ContentRepository\Core\CommandHandler\PendingProjections;
-use Neos\ContentRepository\Core\Projection\ProjectionCatchUpTriggerInterface;
-use Neos\ContentRepository\Core\Projection\Projections;
-use Neos\ContentRepository\Core\Projection\WithMarkStaleInterface;
+use Neos\ContentRepository\Core\ContentRepository;
 use Neos\EventStore\EventStoreInterface;
 use Neos\EventStore\Exception\ConcurrencyException;
 use Neos\EventStore\Model\Events;
@@ -23,9 +20,7 @@
 {
     public function __construct(
         private EventStoreInterface $eventStore,
-        private ProjectionCatchUpTriggerInterface $projectionCatchUpTrigger,
         private EventNormalizer $eventNormalizer,
-        private Projections $projections,
     ) {
     }
 
@@ -34,7 +29,7 @@ public function __construct(
      * @return CommandResult
      * @throws ConcurrencyException in case the expectedVersion does not match
      */
-    public function publishEvents(EventsToPublish $eventsToPublish): CommandResult
+    public function publishEvents(ContentRepository $contentRepository, EventsToPublish $eventsToPublish): CommandResult
     {
         if ($eventsToPublish->events->isEmpty()) {
             return new CommandResult();
@@ -44,21 +39,13 @@ public function publishEvents(EventsToPublish $eventsToPublish): CommandResult
         $normalizedEvents = Events::fromArray(
             $eventsToPublish->events->map($this->eventNormalizer->normalize(...))
         );
-        $commitResult = $this->eventStore->commit(
+        $this->eventStore->commit(
             $eventsToPublish->streamName,
             $normalizedEvents,
             $eventsToPublish->expectedVersion
         );
-        // for performance reasons, we do not want to update ALL projections all the time; but instead only
-        // the projections which are interested in the events from above.
-        // Further details can be found in the docs of PendingProjections.
-        $pendingProjections = PendingProjections::fromProjectionsAndEventsAndSequenceNumber(
-            $this->projections,
-            $eventsToPublish->events,
-            $commitResult->highestCommittedSequenceNumber
-        );
 
-        $this->projectionCatchUpTrigger->triggerCatchUp($pendingProjections->projections);
+        $contentRepository->catchUpProjections();
         return new CommandResult();
     }
 }

Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php

@@ -28,7 +28,6 @@
 use Neos\ContentRepository\Core\Feature\WorkspaceCommandHandler;
 use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter;
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
-use Neos\ContentRepository\Core\Projection\ProjectionCatchUpTriggerInterface;
 use Neos\ContentRepository\Core\Projection\ProjectionsAndCatchUpHooks;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\User\UserIdProviderInterface;
@@ -53,7 +52,6 @@ public function __construct(
         ContentDimensionSourceInterface $contentDimensionSource,
         Serializer $propertySerializer,
         ProjectionsAndCatchUpHooksFactory $projectionsAndCatchUpHooksFactory,
-        private readonly ProjectionCatchUpTriggerInterface $projectionCatchUpTrigger,
         private readonly UserIdProviderInterface $userIdProvider,
         private readonly ClockInterface $clock,
     ) {
@@ -137,7 +135,6 @@ private function buildCommandBus(): CommandBus
                 new ContentStreamCommandHandler(
                 ),
                 new WorkspaceCommandHandler(
-                    $this->buildEventPersister(),
                     $this->projectionFactoryDependencies->eventStore,
                     $this->projectionFactoryDependencies->eventNormalizer,
                 ),
@@ -166,9 +163,7 @@ private function buildEventPersister(): EventPersister
         if (!$this->eventPersister) {
             $this->eventPersister = new EventPersister(
                 $this->projectionFactoryDependencies->eventStore,
-                $this->projectionCatchUpTrigger,
                 $this->projectionFactoryDependencies->eventNormalizer,
-                $this->projectionsAndCatchUpHooks->projections,
             );
         }
         return $this->eventPersister;