[Cache] Use random numbers for initialization of tag version

sbelyshkin · sbelyshkin · commit 2abdaf24f51b · 2021-10-10T18:28:27.000+07:00
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -412,21 +412,19 @@ private function getTagVersions(array $tagsByKey, array $invalidatedTags = [])
             return $tagVersions;
         }
 
-        $tod = gettimeofday();
-        $newVersion = $tod['sec'] * 1000000 + $tod['usec'];
         $updatedTags = [];
         foreach ($this->tags->getItems(array_keys($tags)) as $tag => $version) {
             $tag = $tags[$tag];
 
             if ($version->isHit()) {
                 $tagVersions[$tag] = $version->get();
             } else {
-                $tagVersions[$tag] = $newVersion;
-                $updatedTags[$tag] = $version->set($newVersion);
+                $tagVersions[$tag] = mt_rand(0, \PHP_INT_MAX);
+                $updatedTags[$tag] = $version->set($tagVersions[$tag]);
             }
 
-            if (isset($invalidatedTags[$tag])) {
-                $updatedTags[$tag] = $version->set(++$tagVersions[$tag]);
+            if (isset($invalidatedTags[$tag]) && !isset($updatedTags[$tag])) {
+                $updatedTags[$tag] = $version->set(\PHP_INT_MAX === $tagVersions[$tag] ? 0 : ++$tagVersions[$tag]);
             }
             $this->knownTagVersions[$tag] = [$now, $tagVersions[$tag]];
         }

Original file line number	Diff line number	Diff line change
`@@ -412,21 +412,19 @@ private function getTagVersions(array $tagsByKey, array $invalidatedTags = [])`
`412`	`412`	`return $tagVersions;`
`413`	`413`	`}`
`414`	`414`
`415`		`- $tod = gettimeofday();`
`416`		`- $newVersion = $tod['sec'] * 1000000 + $tod['usec'];`
`417`	`415`	`$updatedTags = [];`
`418`	`416`	`foreach ($this->tags->getItems(array_keys($tags)) as $tag => $version) {`
`419`	`417`	`$tag = $tags[$tag];`
`420`	`418`
`421`	`419`	`if ($version->isHit()) {`
`422`	`420`	`$tagVersions[$tag] = $version->get();`
`423`	`421`	`} else {`
`424`		`- $tagVersions[$tag] = $newVersion;`
`425`		`- $updatedTags[$tag] = $version->set($newVersion);`
	`422`	`+ $tagVersions[$tag] = mt_rand(0, \PHP_INT_MAX);`
	`423`	`+ $updatedTags[$tag] = $version->set($tagVersions[$tag]);`
`426`	`424`	`}`
`427`	`425`
`428`		`- if (isset($invalidatedTags[$tag])) {`
`429`		`- $updatedTags[$tag] = $version->set(++$tagVersions[$tag]);`
	`426`	`+ if (isset($invalidatedTags[$tag]) && !isset($updatedTags[$tag])) {`
	`427`	`+ $updatedTags[$tag] = $version->set(\PHP_INT_MAX === $tagVersions[$tag] ? 0 : ++$tagVersions[$tag]);`
`430`	`428`	`}`
`431`	`429`	`$this->knownTagVersions[$tag] = [$now, $tagVersions[$tag]];`
`432`	`430`	`}`