Replace SchemaCache::get to SchemaCache::getOrSet for correct work wi…

…th PSR caches (#212)
yiisoft · Jan 17, 2021 · 4949a3d · 4949a3d
1 parent 25d5e8f
commit 4949a3d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/src/Cache/SchemaCache.php b/src/Cache/SchemaCache.php
@@ -33,15 +33,22 @@ public function remove($key): void
         $this->cache->remove($key);
     }
 
-    public function get($key, int $default = null)
+    public function getOrSet($key, $value = null, $ttl = null, Dependency $dependency = null)
     {
         return $this->cache->getOrSet(
             $key,
-            static fn () => null,
-            $default,
+            static fn () => $value,
+            $ttl,
+            $dependency,
         );
     }
 
+    public function set($key, $value, $ttl = null, Dependency $dependency = null)
+    {
+        $this->remove($key);
+        $this->getOrSet($key, $value, $ttl, $dependency);
+    }
+
     /**
      * Return number of seconds that table metadata can remain valid in cache.
      *
@@ -84,16 +91,6 @@ public function isEnabled(): bool
         return $this->enabled;
     }
 
-    public function set($key, $value, $ttl = null, Dependency $dependency = null): void
-    {
-        $this->cache->getOrSet(
-            $key,
-            static fn () => $value,
-            $ttl,
-            $dependency
-        );
-    }
-
     /**
      * Whether to enable schema caching. Note that in order to enable truly schema caching, a valid cache component as
      * specified must be enabled and {@see setEnable()} must be set true.

diff --git a/src/Connection/Connection.php b/src/Connection/Connection.php
@@ -804,7 +804,10 @@ protected function openFromPoolSequentially(array $pool): ?self
 
             $key = [__METHOD__, $db->getDsn()];
 
-            if ($this->schemaCache->isEnabled() && $this->schemaCache->get($key)) {
+            if (
+                $this->schemaCache->isEnabled() &&
+                $this->schemaCache->getOrSet($key, null, $this->serverRetryInterval)
+            ) {
                 /** should not try this dead server now */
                 continue;
             }

diff --git a/src/Schema/Schema.php b/src/Schema/Schema.php
@@ -863,7 +863,7 @@ protected function getSchemaMetadata(string $schema, string $type, bool $refresh
      *
      * @param string $name table name.
      * @param string $type metadata type.
-     * @param mixed  $data metadata.
+     * @param mixed $data metadata.
      */
     protected function setTableMetadata(string $name, string $type, $data): void
     {
@@ -910,7 +910,12 @@ private function loadTableMetadataFromCache(string $rawName): void
             return;
         }
 
-        $metadata = $this->schemaCache->get($this->getCacheKey($rawName));
+        $metadata = $this->schemaCache->getOrSet(
+            $this->getCacheKey($rawName),
+            null,
+            $this->schemaCache->getDuration(),
+            new TagDependency(['tags' => $this->getCacheTag()]),
+        );
 
         if (
             !is_array($metadata) ||