WIP: FEATURE: Rework CR CatchUp mechanism

neos · Apr 11, 2024 · 1138434 · 1138434
1 parent 9ee2fc8
commit 1138434
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 113 deletions.
diff --git a/...ontentRepositoryRegistry/Classes/Command/SubprocessProjectionCatchUpCommandController.php b/...ontentRepositoryRegistry/Classes/Command/SubprocessProjectionCatchUpCommandController.php
diff --git a/...r/CatchUpTriggerWithSynchronousOption.php → ...nCatchUpTrigger/DefaultCatchUpTrigger.php b/...r/CatchUpTriggerWithSynchronousOption.php → ...nCatchUpTrigger/DefaultCatchUpTrigger.php
@@ -33,43 +33,14 @@ class CatchUpTriggerWithSynchronousOption implements ProjectionCatchUpTriggerInt
      */
     protected $contentRepositoryRegistry;
 
-    private static bool $synchronousEnabled = false;
-
-    /**
-     * INTERNAL
-     */
-    public static function enableSynchronicityForSpeedingUpTesting(): void
-    {
-        self::$synchronousEnabled = true;
-    }
-
-    public static function synchronously(\Closure $fn): void
-    {
-        $previousValue = self::$synchronousEnabled;
-        self::$synchronousEnabled = true;
-        try {
-            $fn();
-        } finally {
-            self::$synchronousEnabled = $previousValue;
-        }
-    }
-
     public function __construct(
         private readonly ContentRepositoryId $contentRepositoryId,
-        private readonly SubprocessProjectionCatchUpTrigger $inner
     ) {
     }
 
     public function triggerCatchUp(Projections $projections): void
     {
-        if (self::$synchronousEnabled) {
-            $contentRepository = $this->contentRepositoryRegistry->get($this->contentRepositoryId);
-            foreach ($projections as $projection) {
-                $projectionClassName = get_class($projection);
-                $contentRepository->catchUpProjection($projectionClassName, CatchUpOptions::create());
-            }
-        } else {
-            $this->inner->triggerCatchUp($projections);
-        }
+        $contentRepository = $this->contentRepositoryRegistry->get($this->contentRepositoryId);
+        $contentRepository->catchUpProjections();
     }
 }
diff --git a/...rocessProjectionCatchUpTriggerFactory.php → ...efaultProjectionCatchUpTriggerFactory.php b/...rocessProjectionCatchUpTriggerFactory.php → ...efaultProjectionCatchUpTriggerFactory.php
@@ -14,9 +14,8 @@ class SubprocessProjectionCatchUpTriggerFactory implements ProjectionCatchUpTrig
     /** @param array<string, mixed> $options */
     public function build(ContentRepositoryId $contentRepositoryId, array $options): ProjectionCatchUpTriggerInterface
     {
-        return new CatchUpTriggerWithSynchronousOption(
+        return new DefaultCatchUpTrigger(
             $contentRepositoryId,
-            new SubprocessProjectionCatchUpTrigger($contentRepositoryId)
         );
     }
 }
diff --git a/...yRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTrigger.php b/...yRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTrigger.php