Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ba63e18

Browse files
nicolas-grekasnicolas-grekas
committed
[Cache] give 100ms before starting the expiration countdown
1 parent 766162c commit ba63e18

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ static function ($deferred, $namespace, &$expiredIds) use ($getId) {
7676
$key = (string) $key;
7777
if (null === $item->expiry) {
7878
$ttl = 0 < $item->defaultLifetime ? $item->defaultLifetime : 0;
79-
} elseif (0 >= $ttl = (int) ($item->expiry - $now)) {
79+
} elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
8080
$expiredIds[] = $getId($key);
8181
continue;
8282
}
8383
if (isset(($metadata = $item->newMetadata)[CacheItem::METADATA_TAGS])) {
8484
unset($metadata[CacheItem::METADATA_TAGS]);
8585
}
8686
// For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
87-
$byLifetime[$ttl][$getId($key)] = $metadata ? ["\x9D".pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME])."\x5F" => $item->value] : $item->value;
87+
$byLifetime[$ttl][$getId($key)] = $metadata ? ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item->value] : $item->value;
8888
}
8989

9090
return $byLifetime;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static function ($deferred, &$expiredIds) use ($getId, $tagPrefix) {
8282
$key = (string) $key;
8383
if (null === $item->expiry) {
8484
$ttl = 0 < $item->defaultLifetime ? $item->defaultLifetime : 0;
85-
} elseif (0 >= $ttl = (int) ($item->expiry - $now)) {
85+
} elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
8686
$expiredIds[] = $getId($key);
8787
continue;
8888
}
@@ -96,7 +96,7 @@ static function ($deferred, &$expiredIds) use ($getId, $tagPrefix) {
9696

9797
if ($metadata) {
9898
// For compactness, expiry and creation duration are packed, using magic numbers as separators
99-
$value['meta'] = pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME]);
99+
$value['meta'] = pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME]);
100100
}
101101

102102
// Extract tag changes, these should be removed from values in doSave()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static function (CacheItemInterface $innerItem, array $item) {
8484
}
8585
if ($metadata) {
8686
// For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
87-
$item["\0*\0value"] = ["\x9D".pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
87+
$item["\0*\0value"] = ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
8888
}
8989
$innerItem->set($item["\0*\0value"]);
9090
$innerItem->expiresAt(null !== $item["\0*\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6f', $item["\0*\0expiry"])) : null);

‎src/Symfony/Component/Cache/Psr16Cache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function getMultiple($keys, $default = null)
169169
unset($metadata[CacheItem::METADATA_TAGS]);
170170

171171
if ($metadata) {
172-
$values[$key] = ["\x9D".pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME])."\x5F" => $values[$key]];
172+
$values[$key] = ["\x9D".pack('VN', (int) (0.1 + $metadata[CacheItem::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[CacheItem::METADATA_CTIME])."\x5F" => $values[$key]];
173173
}
174174
}
175175

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function testGetMetadata()
109109
$cache->deleteItem('foo');
110110
$cache->get('foo', function ($item) {
111111
$item->expiresAfter(10);
112-
sleep(1);
112+
usleep(999000);
113113

114114
return 'bar';
115115
});

‎src/Symfony/Component/Cache/Traits/ContractsTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private function doGet(AdapterInterface $pool, string $key, callable $callback,
6161
static function (CacheItem $item, float $startTime, ?array &$metadata) {
6262
if ($item->expiry > $endTime = microtime(true)) {
6363
$item->newMetadata[CacheItem::METADATA_EXPIRY] = $metadata[CacheItem::METADATA_EXPIRY] = $item->expiry;
64-
$item->newMetadata[CacheItem::METADATA_CTIME] = $metadata[CacheItem::METADATA_CTIME] = 1000 * (int) ($endTime - $startTime);
64+
$item->newMetadata[CacheItem::METADATA_CTIME] = $metadata[CacheItem::METADATA_CTIME] = (int) ceil(1000 * ($endTime - $startTime));
6565
} else {
6666
unset($metadata[CacheItem::METADATA_EXPIRY], $metadata[CacheItem::METADATA_CTIME]);
6767
}

0 commit comments

Comments
 (0)