Merge pull request #9 from neos/task/concurrency-tests

TASK: Concurrency tests
neos · Jan 15, 2024 · b63b32c · b63b32c
2 parents 46d74af + 8345fe4
commit b63b32c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -38,11 +38,17 @@
         "test:phpstan": "phpstan",
         "test:cs": "phpcs --colors src",
         "test:cs:fix": "phpcbf --colors src",
-        "test:integration": "phpunit tests/Integration",
+        "test:integration": "phpunit tests/Integration --exclude-group=parallel",
+        "test:consistency": [
+            "Neos\\EventStore\\DoctrineAdapter\\Tests\\Integration\\DoctrineEventStoreTest::prepare",
+            "paratest tests/Integration --group=parallel --functional --processes 10",
+            "Neos\\EventStore\\DoctrineAdapter\\Tests\\Integration\\DoctrineEventStoreTest::consistency_validateEvents"
+        ],
         "test": [
             "@test:phpstan",
             "@test:cs",
-            "@test:integration"
+            "@test:integration",
+            "@test:consistency"
         ]
     }
 }
diff --git a/src/DoctrineEventStore.php b/src/DoctrineEventStore.php
@@ -6,6 +6,8 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Exception as DriverException;
 use Doctrine\DBAL\Exception as DbalException;
+use Doctrine\DBAL\Exception\DeadlockException;
+use Doctrine\DBAL\Exception\LockWaitTimeoutException;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Schema\Comparator;
@@ -108,6 +110,9 @@ public function commit(StreamName $streamName, Events $events, ExpectedVersion $
                 $retryWaitInterval *= 2;
                 $this->connection->rollBack();
                 continue;
+            } catch (DeadlockException | LockWaitTimeoutException $exception) {
+                $this->connection->rollBack();
+                throw new ConcurrencyException($exception->getMessage(), 1705330559, $exception);
             } catch (DbalException | ConcurrencyException | \JsonException $exception) {
                 $this->connection->rollBack();
                 throw $exception;

diff --git a/tests/Integration/DoctrineEventStoreTest.php b/tests/Integration/DoctrineEventStoreTest.php
@@ -18,12 +18,14 @@ final class DoctrineEventStoreTest extends AbstractEventStoreTestBase
 {
     private static ?Connection $connection = null;
 
-    protected function createEventStore(): EventStoreInterface
+    protected static function createEventStore(): EventStoreInterface
     {
-        $connection = self::connection();
-        $eventStore = new DoctrineEventStore($connection, self::eventTableName());
-        $eventStore->setup();
+        return new DoctrineEventStore(self::connection(), self::eventTableName());
+    }
 
+    protected static function resetEventStore(): void
+    {
+        $connection = self::connection();
         if ($connection->getDatabasePlatform() instanceof SqlitePlatform) {
             $connection->executeStatement('DELETE FROM ' . self::eventTableName());
             $connection->executeStatement('UPDATE SQLITE_SEQUENCE SET SEQ=0 WHERE NAME="' . self::eventTableName() . '"');
@@ -32,7 +34,6 @@ protected function createEventStore(): EventStoreInterface
         } else {
             $connection->executeStatement('TRUNCATE TABLE ' . self::eventTableName());
         }
-        return $eventStore;
     }
 
     public static function connection(): Connection