FEATURE: Overhaul content stream pruner to work on event stream

Neos.ContentGraph.DoctrineDbalAdapter/src/ContentRepositoryReadModelAdapter.php

@@ -95,7 +95,7 @@ public function findContentStreamById(ContentStreamId $contentStreamId): ?Conten
     {
         $contentStreamByIdStatement = <<<SQL
             SELECT
-                id, sourceContentStreamId, status, version, removed
+                id, sourceContentStreamId, status, version
             FROM
                 {$this->tableNames->contentStream()}
             WHERE
@@ -119,7 +119,7 @@ public function findContentStreams(): ContentStreams
     {
         $contentStreamsStatement = <<<SQL
             SELECT
-                id, sourceContentStreamId, status, version, removed
+                id, sourceContentStreamId, status, version
             FROM
                 {$this->tableNames->contentStream()}
         SQL;
@@ -153,8 +153,7 @@ private static function contentStreamFromDatabaseRow(array $row): ContentStream
             ContentStreamId::fromString($row['id']),
             isset($row['sourceContentStreamId']) ? ContentStreamId::fromString($row['sourceContentStreamId']) : null,
             ContentStreamStatus::from($row['status']),
-            Version::fromInteger((int)$row['version']),
-            (bool)$row['removed']
+            Version::fromInteger((int)$row['version'])
         );
     }
 }

Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php

@@ -129,7 +129,6 @@ private function createContentStreamTable(): Table
             DbalSchemaFactory::columnForContentStreamId('sourceContentStreamId')->setNotnull(false),
             // Should become a DB ENUM (unclear how to configure with DBAL) or int (latter needs adaption to code)
             (new Column('status', Type::getType(Types::BINARY)))->setLength(20)->setNotnull(true),
-            (new Column('removed', Type::getType(Types::BOOLEAN)))->setDefault(false)->setNotnull(false)
         ]);
     }
 

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/ContentStream.php

@@ -36,9 +36,7 @@ private function updateContentStreamStatus(ContentStreamId $contentStreamId, Con
 
     private function removeContentStream(ContentStreamId $contentStreamId): void
     {
-        $this->dbal->update($this->tableNames->contentStream(), [
-            'removed' => true,
-        ], [
+        $this->dbal->delete($this->tableNames->contentStream(), [
             'id' => $contentStreamId->value
         ]);
     }

Neos.ContentRepository.Core/Classes/Feature/ContentStreamEventStreamName.php

@@ -24,7 +24,7 @@
  */
 final readonly class ContentStreamEventStreamName
 {
-    private const EVENT_STREAM_NAME_PREFIX = 'ContentStream:';
+    public const EVENT_STREAM_NAME_PREFIX = 'ContentStream:';
 
     private function __construct(
         public string $value

Neos.ContentRepository.Core/Classes/Service/ContentStreamPruner.php

@@ -10,9 +10,10 @@
 use Neos\ContentRepository\Core\Feature\ContentStreamRemoval\Command\RemoveContentStream;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStream;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
-use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreams;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamStatus;
 use Neos\EventStore\EventStoreInterface;
+use Neos\EventStore\Model\Event\StreamName;
+use Neos\EventStore\Model\EventStream\VirtualStreamName;
 
 /**
  * For implementation details of the content stream states and removed state, see {@see ContentStream}.
@@ -49,6 +50,7 @@ public function prune(bool $removeTemporary = false): iterable
         if ($removeTemporary) {
             $status[] = ContentStreamStatus::CREATED;
             $status[] = ContentStreamStatus::FORKED;
+            $status[] = ContentStreamStatus::CLOSED;
         }
         $unusedContentStreams = $this->contentRepository->findContentStreams()->filter(
             static fn (ContentStream $contentStream) => in_array($contentStream->status, $status, true),
@@ -73,28 +75,28 @@ public function prune(bool $removeTemporary = false): iterable
      *
      *   - Otherwise, we cannot replay the other content streams correctly (if the base content streams are missing).
      *
-     * @return ContentStreams the removed content streams
+     * @return list<StreamName> the removed content streams
      */
-    public function pruneRemovedFromEventStream(): ContentStreams
+    public function pruneRemovedFromEventStream(): array
     {
-        $removedContentStreams = $this->findUnusedAndRemovedContentStreams();
-        foreach ($removedContentStreams as $removedContentStream) {
-            $streamName = ContentStreamEventStreamName::fromContentStreamId($removedContentStream->id)
-                ->getEventStreamName();
-            $this->eventStore->deleteStream($streamName);
+        $removedContentStreams = $this->findUnusedAndRemovedContentStreamIds();
+        foreach ($removedContentStreams as $removedContentStreamName) {
+            $this->eventStore->deleteStream($removedContentStreamName);
         }
         return $removedContentStreams;
     }
 
     public function pruneAll(): void
     {
-        foreach ($this->contentRepository->findContentStreams() as $contentStream) {
-            $streamName = ContentStreamEventStreamName::fromContentStreamId($contentStream->id)->getEventStreamName();
+        foreach ($this->findAllContentStreamEventNames() as $streamName) {
             $this->eventStore->deleteStream($streamName);
         }
     }
 
-    private function findUnusedAndRemovedContentStreams(): ContentStreams
+    /**
+     * @return list<StreamName>
+     */
+    private function findUnusedAndRemovedContentStreamIds(): array
     {
         $allContentStreams = $this->contentRepository->findContentStreams();
 
@@ -105,7 +107,7 @@ private function findUnusedAndRemovedContentStreams(): ContentStreams
 
         // Step 1: Find all content streams currently in direct use by a workspace
         foreach ($allContentStreams as $stream) {
-            if ($stream->status === ContentStreamStatus::IN_USE_BY_WORKSPACE && !$stream->removed) {
+            if ($stream->status === ContentStreamStatus::IN_USE_BY_WORKSPACE) {
                 $contentStreamIdsStack[] = $stream->id;
             }
         }
@@ -129,13 +131,29 @@ private function findUnusedAndRemovedContentStreams(): ContentStreams
         }
 
         // Step 3: Check for removed content streams which we do not need anymore transitively
+        $allContentStreamEventStreamNames = $this->findAllContentStreamEventNames();
+
         $removedContentStreams = [];
-        foreach ($allContentStreams as $contentStream) {
-            if ($contentStream->removed && !array_key_exists($contentStream->id->value, $transitiveUsedStreams)) {
-                $removedContentStreams[] = $contentStream;
+        foreach ($allContentStreamEventStreamNames as $streamName) {
+            $removedContentStream = substr($streamName->value, strlen(ContentStreamEventStreamName::EVENT_STREAM_NAME_PREFIX));
+            if (!array_key_exists($removedContentStream, $transitiveUsedStreams)) {
+                $removedContentStreams[] = $streamName;
             }
         }
 
-        return ContentStreams::fromArray($removedContentStreams);
+        return $removedContentStreams;
+    }
+
+    /**
+     * @return list<StreamName>
+     */
+    private function findAllContentStreamEventNames(): array
+    {
+        $events = $this->eventStore->load(VirtualStreamName::forCategory(ContentStreamEventStreamName::EVENT_STREAM_NAME_PREFIX));
+        $allContentStreamEventStreamNames = [];
+        foreach ($events as $eventEnvelope) {
+            $allContentStreamEventStreamNames[$eventEnvelope->streamName->value] = true;
+        }
+        return array_map(StreamName::fromString(...), array_keys($allContentStreamEventStreamNames));
     }
 }

Neos.ContentRepository.Core/Classes/SharedModel/Workspace/ContentStream.php

@@ -79,7 +79,6 @@ public function __construct(
         public ?ContentStreamId $sourceContentStreamId,
         public ContentStreamStatus $status,
         public Version $version,
-        public bool $removed
     ) {
     }
 }

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php

@@ -135,8 +135,7 @@ protected function readPayloadTable(TableNode $payloadTable): array
     public function iExpectTheContentStreamToNotExist(string $rawContentStreamId): void
     {
         $contentStream = $this->currentContentRepository->findContentStreamById(ContentStreamId::fromString($rawContentStreamId));
-        $contentStreamExists = $contentStream !== null && !$contentStream->removed;
-        Assert::assertFalse($contentStreamExists, sprintf('Content stream "%s" was not expected to exist, but it does', $rawContentStreamId));
+        Assert::assertNull($contentStream, sprintf('Content stream "%s" was not expected to exist, but it does', $rawContentStreamId));
     }
 
     /**

Neos.ContentRepositoryRegistry/Classes/Command/ContentStreamCommandController.php

@@ -60,10 +60,10 @@ public function pruneRemovedFromEventStreamCommand(string $contentRepository = '
         $contentRepositoryId = ContentRepositoryId::fromString($contentRepository);
         $contentStreamPruner = $this->contentRepositoryRegistry->buildService($contentRepositoryId, new ContentStreamPrunerFactory());
 
-        $unusedContentStreams = $contentStreamPruner->pruneRemovedFromEventStream();
+        $unusedContentStreamNames = $contentStreamPruner->pruneRemovedFromEventStream();
         $unusedContentStreamsPresent = false;
-        foreach ($unusedContentStreams as $contentStreamId) {
-            $this->outputFormatted('Removed events for %s', [$contentStreamId->id->value]);
+        foreach ($unusedContentStreamNames as $contentStreamName) {
+            $this->outputFormatted('Removed events for %s', [$contentStreamName->value]);
             $unusedContentStreamsPresent = true;
         }
         if (!$unusedContentStreamsPresent) {