[Cache] Finish Redis adapter
This commit is contained in:
parent
4893cbc24a
commit
6b7a1fcefa
@ -50,6 +50,7 @@ before_install:
|
|||||||
- if [[ $TRAVIS_PHP_VERSION = 5.* && ! $deps ]]; then (cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> $INI_FILE); fi;
|
- if [[ $TRAVIS_PHP_VERSION = 5.* && ! $deps ]]; then (cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> $INI_FILE); fi;
|
||||||
- if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then pecl install -f memcached-2.1.0; fi;
|
- if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then pecl install -f memcached-2.1.0; fi;
|
||||||
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi;
|
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi;
|
||||||
|
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo extension = redis.so >> $INI_FILE; fi;
|
||||||
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
|
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
|
||||||
- if [[ $deps != skip ]]; then composer self-update; fi;
|
- if [[ $deps != skip ]]; then composer self-update; fi;
|
||||||
- if [[ $deps != skip && $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer/* ~/.composer/; composer global install --prefer-dist; fi;
|
- if [[ $deps != skip && $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer/* ~/.composer/; composer global install --prefer-dist; fi;
|
||||||
|
@ -11,25 +11,23 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Cache\Adapter;
|
namespace Symfony\Component\Cache\Adapter;
|
||||||
|
|
||||||
|
use Symfony\Component\Cache\Exception\InvalidArgumentException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Aurimas Niekis <aurimas@niekis.lt>
|
* @author Aurimas Niekis <aurimas@niekis.lt>
|
||||||
*/
|
*/
|
||||||
class RedisAdapter extends AbstractAdapter
|
class RedisAdapter extends AbstractAdapter
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* @var \Redis
|
|
||||||
*/
|
|
||||||
private $redis;
|
private $redis;
|
||||||
|
|
||||||
/**
|
|
||||||
* @param \Redis $redisConnection
|
|
||||||
* @param string $namespace
|
|
||||||
* @param int $defaultLifetime
|
|
||||||
*/
|
|
||||||
public function __construct(\Redis $redisConnection, $namespace = '', $defaultLifetime = 0)
|
public function __construct(\Redis $redisConnection, $namespace = '', $defaultLifetime = 0)
|
||||||
{
|
{
|
||||||
$this->redis = $redisConnection;
|
$this->redis = $redisConnection;
|
||||||
|
|
||||||
|
if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
|
||||||
|
throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
|
||||||
|
}
|
||||||
|
|
||||||
parent::__construct($namespace, $defaultLifetime);
|
parent::__construct($namespace, $defaultLifetime);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,18 +37,13 @@ class RedisAdapter extends AbstractAdapter
|
|||||||
protected function doFetch(array $ids)
|
protected function doFetch(array $ids)
|
||||||
{
|
{
|
||||||
$values = $this->redis->mget($ids);
|
$values = $this->redis->mget($ids);
|
||||||
|
|
||||||
$index = 0;
|
$index = 0;
|
||||||
$result = [];
|
$result = [];
|
||||||
|
|
||||||
foreach ($ids as $id) {
|
foreach ($ids as $id) {
|
||||||
$value = $values[$index++];
|
if (false !== $value = $values[$index++]) {
|
||||||
|
$result[$id] = unserialize($value);
|
||||||
if (false === $value) {
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$result[$id] = unserialize($value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
@ -67,9 +60,19 @@ class RedisAdapter extends AbstractAdapter
|
|||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
protected function doClear()
|
protected function doClear($namespace)
|
||||||
{
|
{
|
||||||
return $this->redis->flushDB();
|
if (!isset($namespace[0])) {
|
||||||
|
$this->redis->flushDB();
|
||||||
|
} else {
|
||||||
|
// As documented in Redis documentation (http://redis.io/commands/keys) using KEYS
|
||||||
|
// can hang your server when it is executed against large databases (millions of items).
|
||||||
|
// Whenever you hit this scale, it is advised to deploy one Redis database per cache pool
|
||||||
|
// instead of using namespaces, so that the above FLUSHDB is used instead.
|
||||||
|
$this->redis->eval(sprintf("local keys=redis.call('KEYS','%s*') for i=1,#keys,5000 do redis.call('DEL',unpack(keys,i,math.min(i+4999,#keys))) end", $namespace));
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -87,21 +90,26 @@ class RedisAdapter extends AbstractAdapter
|
|||||||
*/
|
*/
|
||||||
protected function doSave(array $values, $lifetime)
|
protected function doSave(array $values, $lifetime)
|
||||||
{
|
{
|
||||||
$failed = [];
|
$failed = array();
|
||||||
foreach ($values as $key => $value) {
|
|
||||||
$value = serialize($value);
|
|
||||||
|
|
||||||
if ($lifetime < 1) {
|
foreach ($values as $id => $v) {
|
||||||
$response = $this->redis->set($key, $value);
|
try {
|
||||||
} else {
|
$values[$id] = serialize($v);
|
||||||
$response = $this->redis->setex($key, $lifetime, $value);
|
} catch (\Exception $e) {
|
||||||
}
|
$failed[] = $id;
|
||||||
|
|
||||||
if (false === $response) {
|
|
||||||
$failed[] = $key;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return count($failed) > 0 ? $failed : true;
|
if (!$this->redis->mSet($values)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($lifetime >= 1) {
|
||||||
|
foreach ($values as $id => $v) {
|
||||||
|
$this->redis->expire($id, $lifetime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $failed;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,29 +14,27 @@ namespace Symfony\Component\Cache\Tests\Adapter;
|
|||||||
use Cache\IntegrationTests\CachePoolTest;
|
use Cache\IntegrationTests\CachePoolTest;
|
||||||
use Symfony\Component\Cache\Adapter\RedisAdapter;
|
use Symfony\Component\Cache\Adapter\RedisAdapter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires extension redis
|
||||||
|
*/
|
||||||
class RedisAdapterTest extends CachePoolTest
|
class RedisAdapterTest extends CachePoolTest
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* @var \Redis
|
|
||||||
*/
|
|
||||||
private static $redis;
|
private static $redis;
|
||||||
|
|
||||||
public function createCachePool()
|
public function createCachePool()
|
||||||
{
|
{
|
||||||
return new RedisAdapter($this->getRedis(), __CLASS__);
|
if (defined('HHVM_VERSION')) {
|
||||||
}
|
$this->skippedTests['testDeferredSaveWithoutCommit'] = 'Fails on HHVM';
|
||||||
|
|
||||||
private function getRedis()
|
|
||||||
{
|
|
||||||
if (self::$redis) {
|
|
||||||
return self::$redis;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function setupBeforeClass()
|
||||||
|
{
|
||||||
self::$redis = new \Redis();
|
self::$redis = new \Redis();
|
||||||
self::$redis->connect('127.0.0.1');
|
self::$redis->connect('127.0.0.1');
|
||||||
self::$redis->select(1993);
|
self::$redis->select(1993);
|
||||||
|
|
||||||
return self::$redis;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function tearDownAfterClass()
|
public static function tearDownAfterClass()
|
||||||
|
Reference in New Issue
Block a user