Some code cleanup

Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php

@@ -57,7 +57,7 @@ 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::columnForDimensionSpacePointHash('dimensionspacepointhash')->setNotnull(true),
@@ -66,10 +66,7 @@ private function createHierarchyRelationTable(): Table
         ]);
 
         return $table
-            ->addIndex(['childnodeanchor'])
-            ->addIndex(['contentstreamid'])
-            ->addIndex(['parentnodeanchor'])
-            ->addIndex(['contentstreamid', 'childnodeanchor', 'dimensionspacepointhash'])
+            ->setPrimaryKey(['childnodeanchor', 'contentstreamid', 'dimensionspacepointhash', 'parentnodeanchor'])
             ->addIndex(['contentstreamid', 'dimensionspacepointhash']);
     }
 

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

@@ -56,6 +56,9 @@
  *    - cn -> child node
  *    - h -> the hierarchy edge connecting parent and child
  *    - ph -> the hierarchy edge incoming to the parent (sometimes relevant)
+ *    - dsp -> dimension space point, resolves hashes to full dimension coordinates
+ *    - cdsp -> child dimension space point, same as dsp for child queries
+ *    - pdsp -> parent dimension space point, same as dsp for parent queries
  *
  * @internal the parent interface {@see ContentGraphInterface} is API
  */

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

@@ -15,9 +15,7 @@
 namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Neos\ContentRepository\Core\DimensionSpace\AbstractDimensionSpacePoint;
-use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
 
 /**
@@ -28,9 +26,9 @@
 final class DimensionSpacePoints
 {
     /**
-     * @var string[]
+     * @var array<string, string>
      */
-    private array $dimensionspacePoints = [];
+    private array $dimensionspacePointsRuntimeCache = [];
 
     public function __construct(
         private readonly Connection $databaseConnection,
@@ -40,16 +38,13 @@ public function __construct(
 
     public function insertDimensionSpacePoint(AbstractDimensionSpacePoint $dimensionSpacePoint): void
     {
-        try {
-            $this->databaseConnection->executeStatement(
-                'INSERT INTO ' . $this->tableNamePrefix . '_dimensionspacepoints (hash, dimensionspacepoint) VALUES (:dimensionspacepointhash, :dimensionspacepoint)',
-                [
-                    'dimensionspacepointhash' => $dimensionSpacePoint->hash,
-                    'dimensionspacepoint' => $dimensionSpacePoint->toJson()
-                ]
-            );
-        } catch (UniqueConstraintViolationException $_) {
+        if ($this->getCoordinatesByHashFromRuntimeCache($dimensionSpacePoint->hash) !== null) {
+            return;
         }
+
+        $this->dimensionspacePointsRuntimeCache[$dimensionSpacePoint->hash] = $dimensionSpacePoint->toJson();
+        $this->writeDimensionSpacePoint($dimensionSpacePoint->hash, $dimensionSpacePoint->toJson());
+
     }
 
     /**
@@ -60,39 +55,51 @@ public function insertDimensionSpacePoint(AbstractDimensionSpacePoint $dimension
      */
     public function insertDimensionSpacePointByHashAndCoordinates(string $hash, array $dimensionSpacePointCoordinates): void
     {
-        try {
-            $this->databaseConnection->executeStatement(
-                'INSERT INTO ' . $this->tableNamePrefix . '_dimensionspacepoints (hash, dimensionspacepoint) VALUES (:dimensionspacepointhash, :dimensionspacepoint)',
-                [
-                    'dimensionspacepointhash' => $hash,
-                    'dimensionspacepoint' => json_encode($dimensionSpacePointCoordinates, JSON_THROW_ON_ERROR)
-                ]
-            );
-        } catch (UniqueConstraintViolationException $_) {
+        if ($this->getCoordinatesByHashFromRuntimeCache($hash) !== null) {
+            return;
         }
+
+        $dimensionSpacePointCoordinatesJson = json_encode($dimensionSpacePointCoordinates, JSON_THROW_ON_ERROR);
+        $this->dimensionspacePointsRuntimeCache[$hash] = $dimensionSpacePointCoordinatesJson;
+        $this->writeDimensionSpacePoint($hash, $dimensionSpacePointCoordinatesJson);
     }
 
-    public function getDimensionSpacePointByHash(string $hash): DimensionSpacePoint
+    public function getOriginDimensionSpacePointByHash(string $hash): OriginDimensionSpacePoint
     {
-        if (!isset($this->dimensionspacePoints[$hash])) {
-            $this->fillInternalIndex();
+        $coordinates = $this->getCoordinatesByHashFromRuntimeCache($hash);
+        if ($coordinates === null) {
+            $this->fillRuntimeCacheFromDatabase();
+            $coordinates = $this->getCoordinatesByHashFromRuntimeCache($hash);
+        }
+
+        if ($coordinates === null) {
+            throw new \RuntimeException(sprintf('A DimensionSpacePoint record with the given hash "%s" was not found in the projection, cannot determine coordinates.', $hash), 1710335509);
         }
 
-        return DimensionSpacePoint::fromJsonString($this->dimensionspacePoints[$hash]);
+        return OriginDimensionSpacePoint::fromJsonString($coordinates);
     }
 
-    public function getOriginDimensionSpacePointByHash(string $hash): OriginDimensionSpacePoint
+    private function writeDimensionSpacePoint(string $hash, string $dimensionSpacePointCoordinatesJson): void
     {
-        if (!isset($this->dimensionspacePoints[$hash])) {
-            $this->fillInternalIndex();
-        }
+        $this->databaseConnection->executeStatement(
+            'INSERT IGNORE INTO ' . $this->tableNamePrefix . '_dimensionspacepoints (hash, dimensionspacepoint) VALUES (:dimensionspacepointhash, :dimensionspacepoint)',
+            [
+                'dimensionspacepointhash' => $hash,
+                'dimensionspacepoint' => $dimensionSpacePointCoordinatesJson
+            ]
+        );
+    }
 
-        return OriginDimensionSpacePoint::fromJsonString($this->dimensionspacePoints[$hash]);
+    private function getCoordinatesByHashFromRuntimeCache(string $hash): ?string
+    {
+        return $this->dimensionspacePointsRuntimeCache[$hash] ?? null;
     }
 
-    private function fillInternalIndex(): void
+    private function fillRuntimeCacheFromDatabase(): void
     {
-        $allDimensionSpacePoints = $this->databaseConnection->fetchAllAssociativeIndexed('SELECT hash,dimensionspacepoint FROM ' . $this->tableNamePrefix . '_dimensionspacepoints');
-        $this->dimensionspacePoints = array_map(static fn ($item) => $item['dimensionspacepoint'], $allDimensionSpacePoints);
+        $allDimensionSpacePoints = $this->databaseConnection->fetchAllAssociative('SELECT hash, dimensionspacepoint FROM ' . $this->tableNamePrefix . '_dimensionspacepoints');
+        foreach ($allDimensionSpacePoints as $dimensionSpacePointRow) {
+            $this->dimensionspacePointsRuntimeCache[(string)$dimensionSpacePointRow['hash']] = (string)$dimensionSpacePointRow['dimensionspacepoint'];
+        }
     }
 }