8000 [Cache] Optimize caching of tags · symfony/symfony@1ccd607 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1ccd607

Browse files
sbelyshkinsbelyshkin
committed
[Cache] Optimize caching of tags
1 parent 674ad07 commit 1ccd607

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

‎src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ static function (array $items, array $itemTags) {
7979
);
8080
self::$setTagVersions ??= \Closure::bind(
8181
static function (array $items, array $tagVersions) {
82-
$now = null;
83-
foreach ($items as $key => $item) {
82+
foreach ($items as $item) {
8483
$item->newMetadata[CacheItem::METADATA_TAGS] = array_intersect_key($tagVersions, $item->newMetadata[CacheItem::METADATA_TAGS] ?? []);
8584
}
8685
},
@@ -343,14 +342,16 @@ public function __destruct()
343342
private function getTagVersions(array $tagsByKey, bool $persistTags): array
344343
{
345344
$tagVersions = [];
346-
$fetchTagVersions = false;
345+
$fetchTagVersions = $persistTags;
347346

348347
foreach ($tagsByKey as $tags) {
349348
$tagVersions += $tags;
350-
349+
if ($fetchTagVersions) {
350+
continue;
351+
}
351352
foreach ($tags as $tag => $version) {
352353
if ($tagVersions[$tag] !== $version) {
353-
unset($this->knownTagVersions[$tag]);
354+
$fetchTagVersions = true;
354355
}
355356
}
356357
}
@@ -364,38 +365,38 @@ private function getTagVersions(array $tagsByKey, bool $persistTags): array
364365
foreach ($tagVersions as $tag => $version) {
365366
$tags[$tag.static::TAGS_PREFIX] = $tag;
366367
$knownTagVersion = $this->knownTagVersions[$tag] ?? [0, null];
367-
if ($fetchTagVersions || $knownTagVersion[1] !== $version || $now - $knownTagVersion[0] >= $this->knownTagVersionsTtl) {
368-
// reuse previously fetched tag versions up to the ttl
368+
if ($fetchTagVersions || $knownTagVersion[1] !== $version || $now > $knownTagVersion[0]) {
369+
// reuse previously fetched tag versions until the expiration
370+
unset($this->knownTagVersions[$tag];
369371
$fetchTagVersions = true;
370372
}
371-
unset($this->knownTagVersions[$tag]); // For LRU tracking
372-
if ([0, null] !== $knownTagVersion) {
373-
$this->knownTagVersions[$tag] = $knownTagVersion;
374-
}
375373
}
376374

377375
if (!$fetchTagVersions) {
378376
return $tagVersions;
379377
}
380378

379+
if (\count($this->knownTagVersions) > self::MAX_NUMBER_OF_KNOWN_TAG_VERSIONS && $now > reset($this->knownTagVersions)[0]) {
380+
array_splice($this->knownTagVersions, 0, \count($this->knownTagVersions) >> 2);
381+
}
382+
381383
$newTags = [];
382384
$newVersion = null;
385+
$expiration = $now + $this->knownTagVersionsTtl;
383386
foreach ($this->tags->getItems(array_keys($tags)) as $tag => $version) {
384-
if (!$version->isHit()) {
387+
unset($this->knownTagVersions[$tag = $tags[$tag]]); // update FIFO
388+
if ($persistTags && !$version->isHit()) {
385389
$newTags[$tag] = $version->set($newVersion ??= random_bytes(6));
386390
}
387-
$tagVersions[$tag = $tags[$tag]] = $version->get();
388-
$this->knownTagVersions[$tag] = [$now, $tagVersions[$tag]];
391+
if ($tagVersions[$tag] = $version->get()) {
392+
$this->knownTagVersions[$tag] = [$expiration, $tagVersions[$tag]];
393+
}
389394
}
390395

391-
if ($newTags && $persistTags) {
396+
if ($newTags) {
392397
(self::$saveTags)($this->tags, $newTags);
393398
}
394399

395-
if (\count($this->knownTagVersions) > $maxTags = max(self::MAX_NUMBER_OF_KNOWN_TAG_VERSIONS, \count($newTags) << 1)) {
396-
array_splice($this->knownTagVersions, 0, $maxTags >> 1);
397-
}
398-
399400
return $tagVersions;
400401
}
401402
}

‎src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,18 @@ public function testKnownTagVersionsTtl()
6767

6868
$pool->save($item);
6969
$this->assertTrue($pool->getItem('foo')->isHit());
70-
$this->assertTrue($pool->getItem('foo')->isHit());
7170

72-
sleep(20);
71+
$tagsPool->deleteItem('baz'.TagAwareAdapter::TAGS_PREFIX); // tag invalidation
7372

74-
$this->assertTrue($pool->getItem('foo')->isHit());
73+
$this->assertTrue($pool->getItem('foo')->isHit()); // known tag version is used
7574

76-
sleep(5);
75+
sleep(10);
7776

78-
$this->assertTrue($pool->getItem('foo')->isHit());
77+
$this->assertTrue($pool->getItem('foo')->isHit()); // known tag version is still used
78+
79+
sleep(1);
80+
81+
$this->assertFalse($pool->getItem('foo')->isHit()); // known tag version has expired
7982
}
8083

8184
public function testInvalidateTagsWithArrayAdapter()

0 commit comments

Comments
 (0)
0