Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve config defaults in RedisConnectionPool in the singleton().

Browse source 
* This can avoid fragmentation when applying defaults to different
  config arrays actually gives the same resulting array.

Change-Id: Iacab8d38080f51eb3f331d55a8535eed6d93b381
This commit is contained in:
Aaron Schulz 2013-03-01 14:53:48 -08:00
parent 407f9f886f
commit 1ca99fa957
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
includes/clientpool/RedisConnectionPool.php
View file

@ -72,18 +72,10 @@ class RedisConnectionPool {
throw new MWException( __CLASS__. ' requires the phpredis extension: ' .
'https://github.com/nicolasff/phpredis' );
}
$this->connectTimeout = isset( $options['connectTimeout'] )
? $options['connectTimeout']
: 1;
$this->persistent = isset( $options['persistent'] )
? $options['persistent']
: false;
$this->password = isset( $options['password'] )
? $options['password']
: '';
$this->poolSize = isset( $options['poolSize'] )
? $options['poolSize']
: 5;
$this->connectTimeout = $options['connectTimeout'];
$this->persistent = $options['persistent'];
$this->password = $options['password'];
$this->poolSize = $options['poolSize'];
if ( !isset( $options['serializer'] ) || $options['serializer'] === 'php' ) {
$this->serializer = Redis::SERIALIZER_PHP;
} elseif ( $options['serializer'] === 'igbinary' ) {
@ -93,11 +85,32 @@ class RedisConnectionPool {
}
}
/**
* @param $options Array
* @return Array
*/
protected static function applyDefaultConfig( array $options ) {
if ( !isset( $options['connectTimeout'] ) ) {
$options['connectTimeout'] = 1;
}
if ( !isset( $options['persistent'] ) ) {
$options['persistent'] = false;
}
if ( !isset( $options['password'] ) ) {
$options['password'] = '';
}
if ( !isset( $options['poolSize'] ) ) {
$options['poolSize'] = 1;
}
return $options;
}
/**
* @param $options Array
* @return RedisConnectionPool
*/
public static function singleton( array $options ) {
$options = self::applyDefaultConfig( $options );
// Map the options to a unique hash...
$poolOptions = $options;
unset( $poolOptions['poolSize'] ); // avoid pool fragmentation
@ -109,7 +122,7 @@ class RedisConnectionPool {
wfDebug( "Creating a new " . __CLASS__ . " instance with id $id." );
}
// Simply grow the pool size if the existing one is too small
$psize = isset( $options['poolSize'] ) ? $options['poolSize'] : 1; // size requested
$psize = $options['poolSize']; // size requested
self::$instances[$id]->poolSize = max( $psize, self::$instances[$id]->poolSize );
return self::$instances[$id];