WIP: FEATURE: Rework CR CatchUp mechanism

.composer.json

@@ -42,7 +42,6 @@
       "@test:behat-cli -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -c Neos.ContentRepository.Export/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist",
-      "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
       "@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml"
     ],
     "test:behavioral:stop-on-failure": [
@@ -51,7 +50,6 @@
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.Export/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist",
-      "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml"
     ],
     "test": [

Neos.ContentGraph.DoctrineDbalAdapter/composer.json

@@ -10,8 +10,7 @@
   "license": "GPL-3.0+",
   "require": {
     "neos/contentrepository-core": "self.version",
-    "doctrine/dbal": "^2.13",
-    "doctrine/migrations": "*"
+    "neos/contentrepository-dbaltools": "*"
   },
   "autoload": {
     "psr-4": {

Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php

@@ -8,7 +8,8 @@
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
-use Neos\ContentRepository\Core\Infrastructure\DbalSchemaFactory;
+use Neos\ContentRepository\DbalTools\CheckpointHelper;
+use Neos\ContentRepository\DbalTools\DbalSchemaFactory;
 
 /**
  * @internal
@@ -28,7 +29,8 @@ public function buildSchema(AbstractSchemaManager $schemaManager): Schema
             $this->createNodeTable(),
             $this->createHierarchyRelationTable(),
             $this->createReferenceRelationTable(),
-            $this->createDimensionSpacePointsTable()
+            $this->createDimensionSpacePointsTable(),
+            CheckpointHelper::checkpointTableSchema($this->contentGraphTableNames->checkpoint()),
         ]);
     }
 

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

@@ -33,40 +33,38 @@ abstract protected function getProjectionContentGraph(): ProjectionContentGraph;
      */
     private function whenNodeAggregateWasMoved(NodeAggregateWasMoved $event): void
     {
-        $this->transactional(function () use ($event) {
-            foreach ($event->succeedingSiblingsForCoverage as $succeedingSiblingForCoverage) {
-                $nodeToBeMoved = $this->getProjectionContentGraph()->findNodeInAggregate(
+        foreach ($event->succeedingSiblingsForCoverage as $succeedingSiblingForCoverage) {
+            $nodeToBeMoved = $this->getProjectionContentGraph()->findNodeInAggregate(
+                $event->contentStreamId,
+                $event->nodeAggregateId,
+                $succeedingSiblingForCoverage->dimensionSpacePoint
+            );
+
+            if (is_null($nodeToBeMoved)) {
+                throw EventCouldNotBeAppliedToContentGraph::becauseTheSourceNodeIsMissing(get_class($event));
+            }
+
+            if ($event->newParentNodeAggregateId) {
+                $this->moveNodeBeneathParent(
+                    $event->contentStreamId,
+                    $nodeToBeMoved,
+                    $event->newParentNodeAggregateId,
+                    $succeedingSiblingForCoverage
+                );
+                $this->moveSubtreeTags(
                     $event->contentStreamId,
-                    $event->nodeAggregateId,
+                    $event->newParentNodeAggregateId,
                     $succeedingSiblingForCoverage->dimensionSpacePoint
                 );
-
-                if (is_null($nodeToBeMoved)) {
-                    throw EventCouldNotBeAppliedToContentGraph::becauseTheSourceNodeIsMissing(get_class($event));
-                }
-
-                if ($event->newParentNodeAggregateId) {
-                    $this->moveNodeBeneathParent(
-                        $event->contentStreamId,
-                        $nodeToBeMoved,
-                        $event->newParentNodeAggregateId,
-                        $succeedingSiblingForCoverage
-                    );
-                    $this->moveSubtreeTags(
-                        $event->contentStreamId,
-                        $event->newParentNodeAggregateId,
-                        $succeedingSiblingForCoverage->dimensionSpacePoint
-                    );
-                } else {
-                    $this->moveNodeBeforeSucceedingSibling(
-                        $event->contentStreamId,
-                        $nodeToBeMoved,
-                        $succeedingSiblingForCoverage,
-                    );
-                    // subtree tags stay the same if the parent doesn't change
-                }
+            } else {
+                $this->moveNodeBeforeSucceedingSibling(
+                    $event->contentStreamId,
+                    $nodeToBeMoved,
+                    $succeedingSiblingForCoverage,
+                );
+                // subtree tags stay the same if the parent doesn't change
             }
-        });
+        }
     }
 
     /**
@@ -223,6 +221,4 @@ private function findIngoingHierarchyRelationToBeMoved(
 
 
     abstract protected function getDatabaseConnection(): Connection;
-
-    abstract protected function transactional(\Closure $operations): void;
 }

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

@@ -29,17 +29,15 @@ private function whenNodeAggregateWasRemoved(NodeAggregateWasRemoved $event): vo
     {
         // the focus here is to be correct; that's why the method is not overly performant (for now at least). We might
         // lateron find tricks to improve performance
-        $this->transactional(function () use ($event) {
-            $ingoingRelations = $this->getProjectionContentGraph()->findIngoingHierarchyRelationsForNodeAggregate(
-                $event->contentStreamId,
-                $event->nodeAggregateId,
-                $event->affectedCoveredDimensionSpacePoints
-            );
+        $ingoingRelations = $this->getProjectionContentGraph()->findIngoingHierarchyRelationsForNodeAggregate(
+            $event->contentStreamId,
+            $event->nodeAggregateId,
+            $event->affectedCoveredDimensionSpacePoints
+        );
 
-            foreach ($ingoingRelations as $ingoingRelation) {
-                $this->removeRelationRecursivelyFromDatabaseIncludingNonReferencedNodes($ingoingRelation);
-            }
-        });
+        foreach ($ingoingRelations as $ingoingRelation) {
+            $this->removeRelationRecursivelyFromDatabaseIncludingNonReferencedNodes($ingoingRelation);
+        }
     }
 
     /**
@@ -83,6 +81,4 @@ protected function removeRelationRecursivelyFromDatabaseIncludingNonReferencedNo
     }
 
     abstract protected function getDatabaseConnection(): Connection;
-
-    abstract protected function transactional(\Closure $operations): void;
 }