Move state into store from key

rtek · rtek · commit bba27122772c · 2022-04-10T21:57:40.000-04:00
diff --git a/src/Symfony/Component/Lock/Store/MysqlStore.php b/src/Symfony/Component/Lock/Store/MysqlStore.php
@@ -29,6 +29,9 @@ class MysqlStore implements PersistingStoreInterface
 
     private array $options;
 
+    /** @var bool[] */
+    private static array $locksAcquired = [];
+
     public function __construct(\PDO|string $connOrDsn, array $options = [])
     {
         if ($connOrDsn instanceof \PDO) {
@@ -46,22 +49,20 @@ public function __construct(\PDO|string $connOrDsn, array $options = [])
 
     public function save(Key $key): void
     {
-        if ($key->hasState(__CLASS__)) {
+        $id = $this->getLockId($key);
+
+        if (self::$locksAcquired[$id] ?? false) {
             return;
         }
 
-        // mysql limits lock name length to 64 chars
-        $name = (string) $key;
-        $name = \strlen($name) > 64 ? hash('xxh128', $name) : $name;
-
         $stmt = $this->conn->prepare('SELECT IF(IS_USED_LOCK(:name) = CONNECTION_ID(), -1, GET_LOCK(:name, 0))');
-        $stmt->bindValue(':name', $name, \PDO::PARAM_STR);
+        $stmt->bindValue(':name', self::getLockName($key), \PDO::PARAM_STR);
         $stmt->execute();
         $result = $stmt->fetchColumn();
 
         // lock acquired
         if (1 === $result) {
-            $key->setState(__CLASS__, $name);
+            self::$locksAcquired[$this->getLockId($key)] = true;
 
             return;
         }
@@ -84,28 +85,16 @@ public function putOffExpiration(Key $key, float $ttl): void
 
     public function delete(Key $key): void
     {
-        if (!$key->hasState(__CLASS__)) {
-            return;
-        }
-
         $stmt = $this->conn->prepare('DO RELEASE_LOCK(:name)');
-        $stmt->bindValue(':name', $key->getState(__CLASS__), \PDO::PARAM_STR);
+        $stmt->bindValue(':name', self::getLockName($key), \PDO::PARAM_STR);
         $stmt->execute();
 
-        $key->removeState(__CLASS__);
+        unset(self::$locksAcquired[$this->getLockId($key)]);
     }
 
     public function exists(Key $key): bool
     {
-        if (!$key->hasState(__CLASS__)) {
-            return false;
-        }
-
-        $stmt = $this->conn->prepare('SELECT IF(IS_USED_LOCK(:name) = CONNECTION_ID(), 1, 0)');
-        $stmt->bindValue(':name', $key->getState(__CLASS__), \PDO::PARAM_STR);
-        $stmt->execute();
-
-        return 1 === $stmt->fetchColumn();
+        return self::$locksAcquired[$this->getLockId($key)] ?? false;
     }
 
     private function getConnection(): \PDO
@@ -130,4 +119,17 @@ private function assertMysqlDriver(): void
             throw new InvalidArgumentException(sprintf('The adapter "%s" does not support the "%s" driver.', __CLASS__, $driver));
         }
     }
+
+    private function getLockId(Key $key): string
+    {
+        return spl_object_id($this->getConnection()).'_'.spl_object_id($key);
+    }
+
+    private static function getLockName(Key $key): string
+    {
+        // mysql limits lock name length to 64 chars
+        $name = (string) $key;
+
+        return \strlen($name) > 64 ? hash('xxh128', $name) : $name;
+    }
 }
diff --git a/src/Symfony/Component/Lock/Tests/Store/MysqlStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MysqlStoreTest.php
@@ -53,19 +53,6 @@ public function testExceptionModeRequirement()
         new MysqlStore($pdo);
     }
 
-    public function testSelfConflictException()
-    {
-        $store = $this->getStore();
-        $store->save(new Key('foo'));
-
-        try {
-            $store->save(new Key('foo'));
-            $this->fail('Expected exception: '.LockConflictedException::class);
-        } catch (LockConflictedException $e) {
-            $this->assertStringContainsString('acquired by this', $e->getMessage());
-        }
-    }
-
     public function testOtherConflictException()
     {
         $storeA = $this->getStore();
