Merge pull request #261 from zluiten/feature-gap-detector-interface

Apply GapDetector interface to the PdoEventStoreReadModelProjector

Author: basz

src/Projection/PdoEventStoreReadModelProjector.php

@@ -153,9 +153,9 @@ final class PdoEventStoreReadModelProjector implements MetadataAwareReadModelPro
     private $updateLockThreshold;
 
     /**
-     * @var GapDetection|null
+     * @var GapDetector|null
      */
-    private $gapDetection;
+    private $gapDetector;
 
     /**
      * @var array|null
@@ -190,7 +190,7 @@ public function __construct(
         ?int $loadCount = null,
         bool $triggerPcntlSignalDispatch = false,
         int $updateLockThreshold = 0,
-        ?GapDetection $gapDetection = null
+        ?GapDetector $gapDetection = null
     ) {
         if ($triggerPcntlSignalDispatch && ! \extension_loaded('pcntl')) {
             throw Exception\ExtensionNotLoadedException::withName('pcntl');
@@ -209,7 +209,7 @@ public function __construct(
         $this->status = ProjectionStatus::IDLE();
         $this->triggerPcntlSignalDispatch = $triggerPcntlSignalDispatch;
         $this->updateLockThreshold = $updateLockThreshold;
-        $this->gapDetection = $gapDetection;
+        $this->gapDetector = $gapDetection;
         $this->vendor = $this->connection->getAttribute(PDO::ATTR_DRIVER_NAME);
         while ($eventStore instanceof EventStoreDecorator) {
             /** @var EventStoreDecorator $eventStore */
@@ -533,14 +533,14 @@ public function run(bool $keepRunning = true): void
                     $gapDetected = ! $this->handleStreamWithHandlers($streamEvents);
                 }
 
-                if ($gapDetected && $this->gapDetection) {
-                    $sleep = $this->gapDetection->getSleepForNextRetry();
+                if ($gapDetected && $this->gapDetector) {
+                    $sleep = $this->gapDetector->getSleepForNextRetry();
 
                     \usleep($sleep);
-                    $this->gapDetection->trackRetry();
+                    $this->gapDetector->trackRetry();
                     $this->persist();
                 } else {
-                    $this->gapDetection && $this->gapDetection->resetRetries();
+                    $this->gapDetector && $this->gapDetector->resetRetries();
 
                     if (0 === $this->eventCounter) {
                         \usleep($this->sleep);
@@ -632,9 +632,9 @@ private function handleStreamWithSingleHandler(MergedStreamIterator $events): bo
 
             $this->currentStreamName = $events->streamName();
 
-            if ($this->gapDetection
-                && $this->gapDetection->isGapInStreamPosition((int) $this->streamPositions[$this->currentStreamName], (int) $key)
-                && $this->gapDetection->shouldRetryToFillGap(new \DateTimeImmutable('now', new DateTimeZone('UTC')), $event)
+            if ($this->gapDetector
+                && $this->gapDetector->isGapInStreamPosition((int) $this->streamPositions[$this->currentStreamName], (int) $key)
+                && $this->gapDetector->shouldRetryToFillGap(new \DateTimeImmutable('now', new DateTimeZone('UTC')), $event)
             ) {
                 return false;
             }
@@ -668,9 +668,9 @@ private function handleStreamWithHandlers(MergedStreamIterator $events): bool
 
             $this->currentStreamName = $events->streamName();
 
-            if ($this->gapDetection
-                && $this->gapDetection->isGapInStreamPosition((int) $this->streamPositions[$this->currentStreamName], (int) $key)
-                && $this->gapDetection->shouldRetryToFillGap(new \DateTimeImmutable('now', new DateTimeZone('UTC')), $event)
+            if ($this->gapDetector
+                && $this->gapDetector->isGapInStreamPosition((int) $this->streamPositions[$this->currentStreamName], (int) $key)
+                && $this->gapDetector->shouldRetryToFillGap(new \DateTimeImmutable('now', new DateTimeZone('UTC')), $event)
             ) {
                 return false;
             }