[Cache] Optimize fetching of tags

sbelyshkin · sbelyshkin · commit 78fff0c929ba · 2022-04-04T13:15:52.000+07:00
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -79,8 +79,7 @@ static function (array $items, array $itemTags) {
         );
         self::$setTagVersions ??= \Closure::bind(
             static function (array $items, array $tagVersions) {
-                $now = null;
-                foreach ($items as $key => $item) {
+                foreach ($items as $item) {
                     $item->newMetadata[CacheItem::METADATA_TAGS] = array_intersect_key($tagVersions, $item->newMetadata[CacheItem::METADATA_TAGS] ?? []);
                 }
             },
@@ -347,10 +346,9 @@ private function getTagVersions(array $tagsByKey, bool $persistTags): array
 
         foreach ($tagsByKey as $tags) {
             $tagVersions += $tags;
-
             foreach ($tags as $tag => $version) {
                 if ($tagVersions[$tag] !== $version) {
-                    unset($this->knownTagVersions[$tag]);
+                    $fetchTagVersions = true;
                 }
             }
         }
@@ -360,42 +358,67 @@ private function getTagVersions(array $tagsByKey, bool $persistTags): array
         }
 
         $now = microtime(true);
-        $tags = [];
+        $tags = $newTags = [];
         foreach ($tagVersions as $tag => $version) {
-            $tags[$tag.static::TAGS_PREFIX] = $tag;
-            $knownTagVersion = $this->knownTagVersions[$tag] ?? [0, null];
-            if ($fetchTagVersions || $knownTagVersion[1] !== $version || $now - $knownTagVersion[0] >= $this->knownTagVersionsTtl) {
+            $tags[$tag . static::TAGS_PREFIX] = $tag;
+            $knownTagVersion = $this->knownTagVersions[$tag] ?? [0];
+            if ($fetchTagVersions || $now - $knownTagVersion[0] >= $this->knownTagVersionsTtl) {
                 // reuse previously fetched tag versions up to the ttl
                 $fetchTagVersions = true;
+                continue;
             }
-            unset($this->knownTagVersions[$tag]); // For LRU tracking
-            if ([0, null] !== $knownTagVersion) {
-                $this->knownTagVersions[$tag] = $knownTagVersion;
+            if ($persistTags) {
+                if (null === $knownTagVersion[1]) {
+                    $newTags[$tag] = $knownTagVersion[2];
+                    continue;
+                }
+                $tagVersions[$tag] = $knownTagVersion[1];
+            } elseif ($knownTagVersion[1] !== $version) {
+                $fetchTagVersions = true;
             }
         }
 
         if (!$fetchTagVersions) {
+            if ($newTags) {
+                foreach ($newTags as $tag => $version) {
+                    $tagVersions[$tag] = $version->get();
+                    $this->knownTagVersions[$tag] = [$now, $tagVersions[$tag], null];
+                }
+
+                (self::$saveTags)($this->tags, $newTags);
+            }
+
             return $tagVersions;
         }
 
-        $newTags = [];
+        if (\count($this->knownTagVersions) > self::MAX_NUMBER_OF_KNOWN_TAG_VERSIONS) {
+            array_splice($this->knownTagVersions, 0, \count($this->knownTagVersions) >> 1);
+        }
+
+        $newTags = $tagVersions = [];
         $newVersion = null;
         foreach ($this->tags->getItems(array_keys($tags)) as $tag => $version) {
+            unset($this->knownTagVersions[$tag = $tags[$tag]]); // For LRU tracking
+            $v = null;
             if (!$version->isHit()) {
-                $newTags[$tag] = $version->set($newVersion ??= random_bytes(6));
+                $version->set($newVersion ??= random_bytes(6));
+                if ($persistTags) {
+                    $newTags[$tag] = $version;
+                    $tagVersions[$tag] = $newVersion;
+                } else {
+                    $v = $version; // for future persisting
+                    $tagVersions[$tag] = null;
+                }
+            } else {
+                $tagVersions[$tag] = $version->get();
             }
-            $tagVersions[$tag = $tags[$tag]] = $version->get();
-            $this->knownTagVersions[$tag] = [$now, $tagVersions[$tag]];
+            $this->knownTagVersions[$tag] = [$now, $tagVersions[$tag], $v];
         }
 
-        if ($newTags && $persistTags) {
+        if ($newTags) {
             (self::$saveTags)($this->tags, $newTags);
         }
 
-        if (\count($this->knownTagVersions) > $maxTags = max(self::MAX_NUMBER_OF_KNOWN_TAG_VERSIONS, \count($newTags) << 1)) {
-            array_splice($this->knownTagVersions, 0, $maxTags >> 1);
-        }
-
         return $tagVersions;
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -67,15 +67,18 @@ public function testKnownTagVersionsTtl()
 
         $pool->save($item);
         $this->assertTrue($pool->getItem('foo')->isHit());
-        $this->assertTrue($pool->getItem('foo')->isHit());
 
-        sleep(20);
+        $tagsPool->deleteItem('baz'.TagAwareAdapter::TAGS_PREFIX); // tag invalidation
 
-        $this->assertTrue($pool->getItem('foo')->isHit());
+        $this->assertTrue($pool->getItem('foo')->isHit()); // known tag version is used
 
         sleep(5);
 
-        $this->assertTrue($pool->getItem('foo')->isHit());
+        $this->assertTrue($pool->getItem('foo')->isHit()); // known tag version is still used
+
+        sleep(10);
+
+        $this->assertFalse($pool->getItem('foo')->isHit()); // known tag version has expired
     }
 
     public function testInvalidateTagsWithArrayAdapter()
