Skip to content

[Cache] Don't clone, serialize #17654

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

Merged
nicolas-grekas merged 1 commit into from
Feb 3, 2016
Merged

[Cache] Don't clone, serialize #17654

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
7 changes: 0 additions & 7 deletions src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,6 @@ public function saveDeferred(CacheItemInterface $item)
if (!$item instanceof CacheItem) {
return false;
}
try {
$item = clone $item;
} catch (\Exception $e) {
$value = $item->get();
$type = is_object($value) ? get_class($value) : gettype($value);
CacheItem::log($this->logger, 'Failed to clone key "{key}" ({type})', array('key' => $key, 'type' => $type, 'exception' => $e));
}
$this->deferred[$item->getKey()] = $item;

return true;
Expand Down
35 changes: 26 additions & 9 deletions src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,18 @@ class ArrayAdapter implements CacheItemPoolInterface, LoggerAwareInterface
{
use LoggerAwareTrait;

private $storeSerialized;
private $values = array();
private $expiries = array();
private $createCacheItem;

public function __construct($defaultLifetime = 0)
/**
* @param int $defaultLifetime
* @param bool $storeSerialized Disabling serialization can lead to cache corruptions when storing mutable values but increases performance otherwise.
*/
public function __construct($defaultLifetime = 0, $storeSerialized = true)
{
$this->storeSerialized = $storeSerialized;
$this->createCacheItem = \Closure::bind(
function ($key, $value, $isHit) use ($defaultLifetime) {
$item = new CacheItem();
Expand All @@ -51,10 +57,16 @@ function ($key, $value, $isHit) use ($defaultLifetime) {
*/
public function getItem($key)
{
if (!$isHit = $this->hasItem($key)) {
$value = null;
} elseif ($this->storeSerialized) {
$value = unserialize($this->values[$key]);
} else {
$value = $this->values[$key];
}
$f = $this->createCacheItem;
$isHit = $this->hasItem($key);

return $f($key, $isHit ? $this->values[$key] : null, $isHit);
return $f($key, $value, $isHit);
}

/**
Expand Down Expand Up @@ -125,13 +137,12 @@ public function save(CacheItemInterface $item)
if (0 > $lifetime) {
return true;
}

if (is_object($value)) {
if ($this->storeSerialized) {
try {
$value = clone $value;
$value = serialize($value);
} catch (\Exception $e) {
$type = is_object($value) ? get_class($value) : gettype($value);
CacheItem::log($this->logger, 'Failed to clone key "{key}" ({type})', array('key' => $key, 'type' => $type, 'exception' => $e));
CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => $key, 'type' => $type, 'exception' => $e));

return false;
}
Expand Down Expand Up @@ -179,9 +190,15 @@ private function generateItems(array $keys)
$f = $this->createCacheItem;

foreach ($keys as $key) {
$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= time() || !$this->deleteItem($key));
if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= time() || !$this->deleteItem($key))) {
$value = null;
} elseif ($this->storeSerialized) {
$value = unserialize($this->values[$key]);
} else {
$value = $this->values[$key];
}

yield $key => $f($key, $isHit ? $this->values[$key] : null, $isHit);
yield $key => $f($key, $value, $isHit);
}
}
}
9 changes: 1 addition & 8 deletions src/Symfony/Component/Cache/CacheItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ final class CacheItem implements CacheItemInterface
private $lifetime;
private $defaultLifetime;

public function __clone()
{
if (is_object($this->value)) {
$this->value = clone $this->value;
}
}

/**
* {@inheritdoc}
*/
Expand Down Expand Up @@ -112,7 +105,7 @@ public function expiresAfter($time)
*
* @internal
*/
public function log(LoggerInterface $logger = null, $message, $context = array())
public static function log(LoggerInterface $logger = null, $message, $context = array())
{
if ($logger) {
$logger->warning($message, $context);
Expand Down