Merge branch '9.0' into task/cleanupThingsRegardingEvents

neos · Apr 2, 2024 · a68fbeb · a68fbeb
2 parents 59fdeef + 7d70e85
commit a68fbeb
Show file tree

Hide file tree

Showing 191 changed files with 1,163 additions and 980 deletions.
diff --git a/...lAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php b/...lAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php
@@ -239,7 +239,6 @@ private function transformDatasetToHierarchyRelationRecord(array $dataset): arra
 
         return [
             'contentstreamid' => $dataset['contentStreamId'],
-            'dimensionspacepoint' => $dimensionSpacePoint->toJson(),
             'dimensionspacepointhash' => $dimensionSpacePoint->hash,
             'parentnodeanchor' => $parentHierarchyRelation !== null ? $parentHierarchyRelation['childnodeanchor'] : 9999999,
             'childnodeanchor' => $childHierarchyRelation !== null ? $childHierarchyRelation['childnodeanchor'] : 8888888,

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php
@@ -15,6 +15,7 @@
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\NodeRecord;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\NodeRelationAnchorPoint;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ContentGraph;
+use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\DimensionSpacePointsRepository;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ProjectionContentGraph;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
@@ -90,6 +91,7 @@ public function __construct(
         private readonly NodeTypeManager $nodeTypeManager,
         private readonly ProjectionContentGraph $projectionContentGraph,
         private readonly string $tableNamePrefix,
+        private readonly DimensionSpacePointsRepository $dimensionSpacePointsRepository
     ) {
         $this->checkpointStorage = new DbalCheckpointStorage(
             $this->dbalClient->getConnection(),
@@ -174,6 +176,7 @@ private function truncateDatabaseTables(): void
         $connection->executeQuery('TRUNCATE table ' . $this->tableNamePrefix . '_node');
         $connection->executeQuery('TRUNCATE table ' . $this->tableNamePrefix . '_hierarchyrelation');
         $connection->executeQuery('TRUNCATE table ' . $this->tableNamePrefix . '_referencerelation');
+        $connection->executeQuery('TRUNCATE table ' . $this->tableNamePrefix . '_dimensionspacepoints');
     }
 
     public function canHandle(EventInterface $event): bool
@@ -599,7 +602,6 @@ private function whenContentStreamWasForked(ContentStreamWasForked $event): void
                   childnodeanchor,
                   `name`,
                   position,
-                  dimensionspacepoint,
                   dimensionspacepointhash,
                   subtreetags,
                   contentstreamid
@@ -609,7 +611,6 @@ private function whenContentStreamWasForked(ContentStreamWasForked $event): void
                   h.childnodeanchor,
                   h.name,
                   h.position,
-                  h.dimensionspacepoint,
                   h.dimensionspacepointhash,
                   h.subtreetags,
                   "' . $event->newContentStreamId->value . '" AS contentstreamid
@@ -947,6 +948,8 @@ private function copyReferenceRelations(
     private function whenDimensionSpacePointWasMoved(DimensionSpacePointWasMoved $event): void
     {
         $this->transactional(function () use ($event) {
+            $this->dimensionSpacePointsRepository->insertDimensionSpacePoint($event->target);
+
             // the ordering is important - we first update the OriginDimensionSpacePoints, as we need the
             // hierarchy relations for this query. Then, we update the Hierarchy Relations.
 
@@ -985,7 +988,6 @@ function (NodeRecord $nodeRecord) use ($event) {
                 '
                 UPDATE ' . $this->tableNamePrefix . '_hierarchyrelation h
                     SET
-                        h.dimensionspacepoint = :newDimensionSpacePoint,
                         h.dimensionspacepointhash = :newDimensionSpacePointHash
                     WHERE
                       h.dimensionspacepointhash = :originalDimensionSpacePointHash
@@ -994,7 +996,6 @@ function (NodeRecord $nodeRecord) use ($event) {
                 [
                     'originalDimensionSpacePointHash' => $event->source->hash,
                     'newDimensionSpacePointHash' => $event->target->hash,
-                    'newDimensionSpacePoint' => $event->target->toJson(),
                     'contentStreamId' => $event->contentStreamId->value
                 ]
             );
@@ -1004,6 +1005,8 @@ function (NodeRecord $nodeRecord) use ($event) {
     private function whenDimensionShineThroughWasAdded(DimensionShineThroughWasAdded $event): void
     {
         $this->transactional(function () use ($event) {
+            $this->dimensionSpacePointsRepository->insertDimensionSpacePoint($event->target);
+
             // 1) hierarchy relations
             $this->getDatabaseConnection()->executeStatement(
                 '
@@ -1013,7 +1016,6 @@ private function whenDimensionShineThroughWasAdded(DimensionShineThroughWasAdded
                   `name`,
                   position,
                   subtreetags,
-                  dimensionspacepoint,
                   dimensionspacepointhash,
                   contentstreamid
                 )
@@ -1023,7 +1025,6 @@ private function whenDimensionShineThroughWasAdded(DimensionShineThroughWasAdded
                   h.name,
                   h.position,
                   h.subtreetags,
-                 :newDimensionSpacePoint AS dimensionspacepoint,
                  :newDimensionSpacePointHash AS dimensionspacepointhash,
                   h.contentstreamid
                 FROM
@@ -1034,7 +1035,6 @@ private function whenDimensionShineThroughWasAdded(DimensionShineThroughWasAdded
                     'contentStreamId' => $event->contentStreamId->value,
                     'sourceDimensionSpacePointHash' => $event->source->hash,
                     'newDimensionSpacePointHash' => $event->target->hash,
-                    'newDimensionSpacePoint' => $event->target->toJson(),
                 ]
             );
         });

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjectionFactory.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjectionFactory.php
@@ -4,6 +4,7 @@
 
 namespace Neos\ContentGraph\DoctrineDbalAdapter;
 
+use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\DimensionSpacePointsRepository;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ProjectionContentGraph;
 use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies;
@@ -40,21 +41,25 @@ public function build(
             $projectionFactoryDependencies->contentRepositoryId
         );
 
+        $dimensionSpacePointsRepository = new DimensionSpacePointsRepository($this->dbalClient->getConnection(), $tableNamePrefix);
+
         return new ContentGraphProjection(
             new DoctrineDbalContentGraphProjection(
                 $this->dbalClient,
                 new NodeFactory(
                     $projectionFactoryDependencies->contentRepositoryId,
                     $projectionFactoryDependencies->nodeTypeManager,
-                    $projectionFactoryDependencies->propertyConverter
+                    $projectionFactoryDependencies->propertyConverter,
+                    $dimensionSpacePointsRepository
                 ),
                 $projectionFactoryDependencies->contentRepositoryId,
                 $projectionFactoryDependencies->nodeTypeManager,
                 new ProjectionContentGraph(
                     $this->dbalClient,
                     $tableNamePrefix
                 ),
-                $tableNamePrefix
+                $tableNamePrefix,
+                $dimensionSpacePointsRepository
             )
         );
     }

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php
@@ -28,6 +28,7 @@ public function buildSchema(AbstractSchemaManager $schemaManager): Schema
             $this->createNodeTable(),
             $this->createHierarchyRelationTable(),
             $this->createReferenceRelationTable(),
+            $this->createDimensionSpacePointsTable()
         ]);
     }
 
@@ -36,7 +37,6 @@ private function createNodeTable(): Table
         $table = new Table($this->tableNamePrefix . '_node', [
             DbalSchemaFactory::columnForNodeAnchorPoint('relationanchorpoint')->setAutoincrement(true),
             DbalSchemaFactory::columnForNodeAggregateId('nodeaggregateid')->setNotnull(false),
-            DbalSchemaFactory::columnForDimensionSpacePoint('origindimensionspacepoint')->setNotnull(false),
             DbalSchemaFactory::columnForDimensionSpacePointHash('origindimensionspacepointhash')->setNotnull(false),
             DbalSchemaFactory::columnForNodeTypeName('nodetypename'),
             (new Column('properties', Type::getType(Types::TEXT)))->setNotnull(true)->setCustomSchemaOption('collation', self::DEFAULT_TEXT_COLLATION),
@@ -56,24 +56,31 @@ private function createNodeTable(): Table
     private function createHierarchyRelationTable(): Table
     {
         $table = new Table($this->tableNamePrefix . '_hierarchyrelation', [
-            (new Column('name', Type::getType(Types::STRING)))->setLength(255)->setNotnull(false)->setCustomSchemaOption('collation', self::DEFAULT_TEXT_COLLATION),
+            (new Column('name', Type::getType(Types::STRING)))->setLength(255)->setNotnull(false)->setCustomSchemaOption('charset', 'ascii')->setCustomSchemaOption('collation', 'ascii_general_ci'),
             (new Column('position', Type::getType(Types::INTEGER)))->setNotnull(true),
             DbalSchemaFactory::columnForContentStreamId('contentstreamid')->setNotnull(true),
-            DbalSchemaFactory::columnForDimensionSpacePoint('dimensionspacepoint')->setNotnull(true),
             DbalSchemaFactory::columnForDimensionSpacePointHash('dimensionspacepointhash')->setNotnull(true),
             DbalSchemaFactory::columnForNodeAnchorPoint('parentnodeanchor'),
             DbalSchemaFactory::columnForNodeAnchorPoint('childnodeanchor'),
             (new Column('subtreetags', Type::getType(Types::JSON)))->setDefault('{}'),
         ]);
 
         return $table
-            ->addIndex(['childnodeanchor'])
-            ->addIndex(['contentstreamid'])
-            ->addIndex(['parentnodeanchor'])
-            ->addIndex(['contentstreamid', 'childnodeanchor', 'dimensionspacepointhash'])
+            ->setPrimaryKey(['childnodeanchor', 'contentstreamid', 'dimensionspacepointhash', 'parentnodeanchor'])
             ->addIndex(['contentstreamid', 'dimensionspacepointhash']);
     }
 
+    private function createDimensionSpacePointsTable(): Table
+    {
+        $table = new Table($this->tableNamePrefix . '_dimensionspacepoints', [
+            DbalSchemaFactory::columnForDimensionSpacePointHash('hash')->setNotnull(true),
+            DbalSchemaFactory::columnForDimensionSpacePoint('dimensionspacepoint')->setNotnull(true)
+        ]);
+
+        return $table
+            ->setPrimaryKey(['hash']);
+    }
+
     private function createReferenceRelationTable(): Table
     {
         $table = new Table($this->tableNamePrefix . '_referencerelation', [

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/HierarchyRelation.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/HierarchyRelation.php
@@ -16,6 +16,7 @@
 
 use Doctrine\DBAL\Connection;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
+use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\DimensionSpacePointsRepository;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTags;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
@@ -44,16 +45,22 @@ public function __construct(
      */
     public function addToDatabase(Connection $databaseConnection, string $tableNamePrefix): void
     {
-        $databaseConnection->insert($tableNamePrefix . '_hierarchyrelation', [
-            'parentnodeanchor' => $this->parentNodeAnchor->value,
-            'childnodeanchor' => $this->childNodeAnchor->value,
-            'name' => $this->name?->value,
-            'contentstreamid' => $this->contentStreamId->value,
-            'dimensionspacepoint' => $this->dimensionSpacePoint->toJson(),
-            'dimensionspacepointhash' => $this->dimensionSpacePointHash,
-            'position' => $this->position,
-            'subtreetags' => json_encode($this->subtreeTags, JSON_THROW_ON_ERROR | JSON_FORCE_OBJECT),
-        ]);
+        $databaseConnection->transactional(function ($databaseConnection) use (
+            $tableNamePrefix
+        ) {
+            $dimensionSpacePoints = new DimensionSpacePointsRepository($databaseConnection, $tableNamePrefix);
+            $dimensionSpacePoints->insertDimensionSpacePoint($this->dimensionSpacePoint);
+
+            $databaseConnection->insert($tableNamePrefix . '_hierarchyrelation', [
+                'parentnodeanchor' => $this->parentNodeAnchor->value,
+                'childnodeanchor' => $this->childNodeAnchor->value,
+                'name' => $this->name?->value,
+                'contentstreamid' => $this->contentStreamId->value,
+                'dimensionspacepointhash' => $this->dimensionSpacePointHash,
+                'position' => $this->position,
+                'subtreetags' => json_encode($this->subtreeTags, JSON_THROW_ON_ERROR | JSON_FORCE_OBJECT),
+            ]);
+        });
     }
 
     /**

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/NodeRecord.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/NodeRecord.php
@@ -15,7 +15,9 @@
 namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Types\Types;
+use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\DimensionSpacePointsRepository;
 use Neos\ContentRepository\Core\Feature\NodeModification\Dto\SerializedPropertyValues;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Timestamps;
@@ -55,7 +57,6 @@ public function updateToDatabase(Connection $databaseConnection, string $tableNa
             $tableNamePrefix . '_node',
             [
                 'nodeaggregateid' => $this->nodeAggregateId->value,
-                'origindimensionspacepoint' => json_encode($this->originDimensionSpacePoint),
                 'origindimensionspacepointhash' => $this->originDimensionSpacePointHash,
                 'properties' => json_encode($this->properties),
                 'nodetypename' => $this->nodeTypeName->value,
@@ -138,25 +139,38 @@ public static function createNewInDatabase(
         ?NodeName $nodeName,
         Timestamps $timestamps,
     ): self {
-        $databaseConnection->insert($tableNamePrefix . '_node', [
-            'nodeaggregateid' => $nodeAggregateId->value,
-            'origindimensionspacepoint' => json_encode($originDimensionSpacePoint),
-            'origindimensionspacepointhash' => $originDimensionSpacePointHash,
-            'properties' => json_encode($properties),
-            'nodetypename' => $nodeTypeName->value,
-            'classification' => $classification->value,
-            'created' => $timestamps->created,
-            'originalcreated' => $timestamps->originalCreated,
-            'lastmodified' => $timestamps->lastModified,
-            'originallastmodified' => $timestamps->originalLastModified,
-        ], [
-            'created' => Types::DATETIME_IMMUTABLE,
-            'originalcreated' => Types::DATETIME_IMMUTABLE,
-            'lastmodified' => Types::DATETIME_IMMUTABLE,
-            'originallastmodified' => Types::DATETIME_IMMUTABLE,
-        ]);
+        $relationAnchorPoint = $databaseConnection->transactional(function ($databaseConnection) use (
+            $tableNamePrefix,
+            $nodeAggregateId,
+            $originDimensionSpacePoint,
+            $originDimensionSpacePointHash,
+            $properties,
+            $nodeTypeName,
+            $classification,
+            $timestamps
+        ) {
+            $dimensionSpacePoints = new DimensionSpacePointsRepository($databaseConnection, $tableNamePrefix);
+            $dimensionSpacePoints->insertDimensionSpacePointByHashAndCoordinates($originDimensionSpacePointHash, $originDimensionSpacePoint);
+
+            $databaseConnection->insert($tableNamePrefix . '_node', [
+                'nodeaggregateid' => $nodeAggregateId->value,
+                'origindimensionspacepointhash' => $originDimensionSpacePointHash,
+                'properties' => json_encode($properties),
+                'nodetypename' => $nodeTypeName->value,
+                'classification' => $classification->value,
+                'created' => $timestamps->created,
+                'originalcreated' => $timestamps->originalCreated,
+                'lastmodified' => $timestamps->lastModified,
+                'originallastmodified' => $timestamps->originalLastModified,
+            ], [
+                'created' => Types::DATETIME_IMMUTABLE,
+                'originalcreated' => Types::DATETIME_IMMUTABLE,
+                'lastmodified' => Types::DATETIME_IMMUTABLE,
+                'originallastmodified' => Types::DATETIME_IMMUTABLE,
+            ]);
 
-        $relationAnchorPoint = NodeRelationAnchorPoint::fromInteger((int)$databaseConnection->lastInsertId());
+            return NodeRelationAnchorPoint::fromInteger((int)$databaseConnection->lastInsertId());
+        });
 
         return new self(
             $relationAnchorPoint,

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/NodeRelationAnchorPoint.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/NodeRelationAnchorPoint.php
@@ -19,17 +19,14 @@
  *
  * @internal
  */
-class NodeRelationAnchorPoint implements \JsonSerializable
+final readonly class NodeRelationAnchorPoint implements \JsonSerializable
 {
-    public readonly int $value;
-
-    private function __construct(int $value)
-    {
+    private function __construct(
+        public int $value
+    ) {
         if ($value < 0) {
             throw new \InvalidArgumentException('A NodeRelationAnchorPoint cannot be negative, got %d', $value);
         }
-
-        $this->value = $value;
     }
 
     public static function forRootEdge(): self