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

Move some memcached classes to /libs

Browse source 
Also removed a few MW dependencies from MemcachedPeclBagOStuff.
It still uses an IP class method, so it has to stay for now.

Change-Id: I8c5c83046c58fb58091d6ce11b2385208262460f
This commit is contained in:
Aaron Schulz 2015-10-24 14:54:10 -07:00
parent 6989e1c8d6
commit f36b73e96c
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
autoload.php
View file

@ -720,7 +720,7 @@ $wgAutoloadLocalClasses = array(
'MWExceptionHandler' => __DIR__ . '/includes/exception/MWExceptionHandler.php',
'MWHookException' => __DIR__ . '/includes/Hooks.php',
'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
'MWMemcached' => __DIR__ . '/includes/objectcache/MemcachedClient.php',
'MWMemcached' => __DIR__ . '/includes/libs/objectcache/MemcachedClient.php',
'MWMessagePack' => __DIR__ . '/includes/libs/MWMessagePack.php',
'MWNamespace' => __DIR__ . '/includes/MWNamespace.php',
'MWOldPassword' => __DIR__ . '/includes/password/MWOldPassword.php',
@ -778,11 +778,11 @@ $wgAutoloadLocalClasses = array(
'MediaWiki\\Widget\\NamespaceInputWidget' => __DIR__ . '/includes/widget/NamespaceInputWidget.php',
'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . '/includes/widget/TitleInputWidget.php',
'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',
'MemCachedClientforWiki' => __DIR__ . '/includes/objectcache/MemcachedClient.php',
'MemCachedClientforWiki' => __DIR__ . '/includes/libs/objectcache/MemcachedClient.php',
'MemcLockManager' => __DIR__ . '/includes/filebackend/lockmanager/MemcLockManager.php',
'MemcachedBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedBagOStuff.php',
'MemcachedBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedBagOStuff.php',
'MemcachedPeclBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedPeclBagOStuff.php',
'MemcachedPhpBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedPhpBagOStuff.php',
'MemcachedPhpBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedPhpBagOStuff.php',
'MemoizedCallable' => __DIR__ . '/includes/libs/MemoizedCallable.php',
'MemoryFileBackend' => __DIR__ . '/includes/filebackend/MemoryFileBackend.php',
'MergeHistoryPager' => __DIR__ . '/includes/specials/SpecialMergeHistory.php',

0
includes/objectcache/MemcachedBagOStuff.php → includes/libs/objectcache/MemcachedBagOStuff.php
View file

0
includes/objectcache/MemcachedClient.php → includes/libs/objectcache/MemcachedClient.php
View file

2
includes/objectcache/MemcachedPhpBagOStuff.php → includes/libs/objectcache/MemcachedPhpBagOStuff.php
View file

@ -45,7 +45,7 @@ class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
parent::__construct( $params );
$params = $this->applyDefaultParams( $params );
$this->client = new MemCachedClientforWiki( $params );
$this->client = new MWMemcached( $params );
$this->client->set_servers( $params['servers'] );
$this->client->set_debug( $params['debug'] );
}

10
includes/objectcache/MemcachedPeclBagOStuff.php
View file

@ -100,13 +100,17 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff {
break;
case 'igbinary':
if ( !Memcached::HAVE_IGBINARY ) {
throw new MWException( __CLASS__ . ': the igbinary extension is not available ' .
'but igbinary serialization was requested.' );
throw new InvalidArgumentException(
__CLASS__ . ': the igbinary extension is not available ' .
'but igbinary serialization was requested.'
);
}
$this->client->setOption( Memcached::OPT_SERIALIZER, Memcached::SERIALIZER_IGBINARY );
break;
default:
throw new MWException( __CLASS__ . ': invalid value for serializer parameter' );
throw new InvalidArgumentException(
__CLASS__ . ': invalid value for serializer parameter'
);
}
$servers = array();
foreach ( $params['servers'] as $host ) {