TASK: (Re-)introduce runtime cache on content repository

Neos.ContentRepository.Core/Classes/ContentRepository.php

@@ -61,6 +61,14 @@
  */
 final class ContentRepository
 {
+    /**
+     * @var array<string,ContentGraphInterface>|false indexed by workspace name, false if disabled
+     */
+    private array|false $contentGraphsRuntimeCache = [];
+
+    /** @var Workspaces|false|null false if disabled */
+    private Workspaces|null|false $workspacesRuntimeCache = null;
+
     /**
      * @internal use the {@see ContentRepositoryFactory::getOrBuild()} to instantiate
      */
@@ -95,6 +103,7 @@ public function handle(CommandInterface $command): void
             throw AccessDenied::becauseCommandIsNotGranted($command, $privilege->getReason());
         }
 
+        $this->resetRuntimeCaches(disable: true);
         $toPublish = $this->commandBus->handle($command);
         $correlationId = CorrelationId::fromString(sprintf('%s_%s', substr($command::class, strrpos($command::class, '\\') + 1, 20), bin2hex(random_bytes(9))));
 
@@ -143,13 +152,13 @@ public function handle(CommandInterface $command): void
                 throw CatchUpHadErrors::createFromErrors($fullCatchUpResult->errors);
             }
         }
+        $this->resetRuntimeCaches();
         $additionalCommands = $this->commandHook->onAfterHandle($command, $publishedEvents);
         foreach ($additionalCommands as $additionalCommand) {
             $this->handle($additionalCommand);
         }
     }
 
-
     /**
      * @template T of ProjectionStateInterface
      * @param class-string<T> $projectionStateClassName
@@ -170,6 +179,9 @@ public function getContentGraph(WorkspaceName $workspaceName): ContentGraphInter
         if (!$privilege->granted) {
             throw AccessDenied::becauseWorkspaceCantBeRead($workspaceName, $privilege->getReason());
         }
+        if ($this->contentGraphsRuntimeCache !== false) {
+            return $this->contentGraphsRuntimeCache[$workspaceName->value] ??= $this->contentGraphReadModel->getContentGraph($workspaceName);
+        }
         return $this->contentGraphReadModel->getContentGraph($workspaceName);
     }
 
@@ -192,6 +204,9 @@ public function getContentSubgraph(WorkspaceName $workspaceName, DimensionSpaceP
      */
     public function findWorkspaceByName(WorkspaceName $workspaceName): ?Workspace
     {
+        if ($this->workspacesRuntimeCache) {
+            return $this->workspacesRuntimeCache->get($workspaceName);
+        }
         return $this->contentGraphReadModel->findWorkspaceByName($workspaceName);
     }
 
@@ -201,6 +216,9 @@ public function findWorkspaceByName(WorkspaceName $workspaceName): ?Workspace
      */
     public function findWorkspaces(): Workspaces
     {
+        if ($this->workspacesRuntimeCache !== false) {
+            return $this->workspacesRuntimeCache ??= $this->contentGraphReadModel->findWorkspaces();
+        }
         return $this->contentGraphReadModel->findWorkspaces();
     }
 
@@ -219,6 +237,15 @@ public function getContentDimensionSource(): ContentDimensionSourceInterface
         return $this->contentDimensionSource;
     }
 
+    /**
+     * @param bool $disable to fully reset & deactivate the caches. This is required to deliver correct (uncached) results in case a catchup hook accesses this content repository.
+     */
+    private function resetRuntimeCaches(bool $disable = false): void
+    {
+        $this->workspacesRuntimeCache = $disable ? false : null;
+        $this->contentGraphsRuntimeCache = $disable ? false : [];
+    }
+
     private function enrichAndNormalizeEvents(DomainEvents $events, CorrelationId $correlationId): Events
     {
         $initiatingUserId = $this->authProvider->getAuthenticatedUserId() ?? UserId::forSystemUser();

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphReadModelInterface.php

@@ -33,7 +33,6 @@ interface ContentGraphReadModelInterface extends ProjectionStateInterface
 {
     /**
      * @throws WorkspaceDoesNotExist if the workspace does not exist
-     * todo cache instances to reduce queries (revert https://github.com/neos/neos-development-collection/pull/5246)
      */
     public function getContentGraph(WorkspaceName $workspaceName): ContentGraphInterface;