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

Delay language conversion cache construction until needed

Browse source 
Instead of instantiating this on every single request. Removes
wfGetLangConverterCacheStorage() and $wgLangConvMemc which were
otherwise unused.

Change-Id: Ic500944a92c2a94bc649e1b492c33714d81dca00
This commit is contained in:
Chad Horohoe 2015-03-03 21:10:57 -08:00
parent afe3c2c03a
commit 9971834131
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/GlobalFunctions.php
View file

@ -4008,16 +4008,6 @@ function wfGetParserCacheStorage() {
return ObjectCache::getInstance( $wgParserCacheType );
}
/**
* Get the cache object used by the language converter
*
* @return BagOStuff
*/
function wfGetLangConverterCacheStorage() {
global $wgLanguageConverterCacheType;
return ObjectCache::getInstance( $wgLanguageConverterCacheType );
}
/**
* Call hook functions defined in $wgHooks
*

1
includes/Setup.php
View file

@ -573,7 +573,6 @@ $ps_memcached = Profiler::instance()->scopedProfileIn( $fname . '-memcached' );
$wgMemc = wfGetMainCache();
$messageMemc = wfGetMessageCacheStorage();
$parserMemc = wfGetParserCacheStorage();
$wgLangConvMemc = wfGetLangConverterCacheStorage();
wfDebugLog( 'caches', 'main: ' . get_class( $wgMemc ) .
', message: ' . get_class( $messageMemc ) .

7
languages/LanguageConverter.php
View file

@ -842,7 +842,7 @@ class LanguageConverter {
* @param bool $fromCache Load from memcached? Defaults to true.
*/
function loadTables( $fromCache = true ) {
global $wgLangConvMemc;
global $wgLanguageConverterCacheType;
if ( $this->mTablesLoaded ) {
return;
@ -850,9 +850,10 @@ class LanguageConverter {
$this->mTablesLoaded = true;
$this->mTables = false;
$cache = ObjectCache::getInstance( $wgLanguageConverterCacheType );
if ( $fromCache ) {
wfProfileIn( __METHOD__ . '-cache' );
$this->mTables = $wgLangConvMemc->get( $this->mCacheKey );
$this->mTables = $cache->get( $this->mCacheKey );
wfProfileOut( __METHOD__ . '-cache' );
}
if ( !$this->mTables || !array_key_exists( self::CACHE_VERSION_KEY, $this->mTables ) ) {
@ -869,7 +870,7 @@ class LanguageConverter {
$this->postLoadTables();
$this->mTables[self::CACHE_VERSION_KEY] = true;
$wgLangConvMemc->set( $this->mCacheKey, $this->mTables, 43200 );
$cache->set( $this->mCacheKey, $this->mTables, 43200 );
wfProfileOut( __METHOD__ . '-recache' );
}
}