Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Cache] fix saving unrelated keys in recursive callback calls #31479

Merged
merged 1 commit into from
May 12, 2019
Merged

[Cache] fix saving unrelated keys in recursive callback calls #31479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,26 @@ public function testGet()
$this->assertFalse($isHit);
}

public function testRecursiveGet()
{
if (isset($this->skippedTests[__FUNCTION__])) {
$this->markTestSkipped($this->skippedTests[__FUNCTION__]);
}

$cache = $this->createCachePool(0, __FUNCTION__);

$v = $cache->get('k1', function () use (&$counter, $cache) {
$v = $cache->get('k2', function () use (&$counter) { return ++$counter; });
$v = $cache->get('k2', function () use (&$counter) { return ++$counter; });

return $v;
});

$this->assertSame(1, $counter);
$this->assertSame(1, $v);
$this->assertSame(1, $cache->get('k2', function () { return 2; }));
}

public function testGetMetadata()
{
if (isset($this->skippedTests[__FUNCTION__])) {
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class PhpArrayAdapterTest extends AdapterTestCase
{
protected $skippedTests = [
'testGet' => 'PhpArrayAdapter is read-only.',
'testRecursiveGet' => 'PhpArrayAdapter is read-only.',
'testBasicUsage' => 'PhpArrayAdapter is read-only.',
'testBasicUsageWithLongKey' => 'PhpArrayAdapter is read-only.',
'testClear' => 'PhpArrayAdapter is read-only.',
Expand Down
12 changes: 7 additions & 5 deletions src/Symfony/Component/Cache/Traits/ContractsTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ trait ContractsTrait
}

private $callbackWrapper = [LockRegistry::class, 'compute'];
private $computing = [];

/**
* Wraps the callback passed to ->get() in a callable.
Expand Down Expand Up @@ -68,26 +69,27 @@ function (CacheItem $item, float $startTime, ?array &$metadata) {
CacheItem::class
);

return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata) {
return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata, $key) {
// don't wrap nor save recursive calls
if (null === $callbackWrapper = $this->callbackWrapper) {
if (isset($this->computing[$key])) {
$value = $callback($item, $save);
$save = false;

return $value;
}
$this->callbackWrapper = null;

$this->computing[$key] = $key;
$startTime = microtime(true);

try {
$value = $callbackWrapper($callback, $item, $save, $pool, function (CacheItem $item) use ($setMetadata, $startTime, &$metadata) {
$value = ($this->callbackWrapper)($callback, $item, $save, $pool, function (CacheItem $item) use ($setMetadata, $startTime, &$metadata) {
$setMetadata($item, $startTime, $metadata);
});
$setMetadata($item, $startTime, $metadata);

return $value;
} finally {
$this->callbackWrapper = $callbackWrapper;
unset($this->computing[$key]);
}
}, $beta, $metadata);
}
Expand Down