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

Revert r101492, broken, see CR. Also revert followup r101496.

Browse source
This commit is contained in:
Roan Kattouw 2011-11-01 16:51:31 +00:00
parent 6c6cb64095
commit 1fd659cc5b
2 changed files with 3 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/AutoLoader.php
View file

@ -127,7 +127,6 @@ $wgAutoloadLocalClasses = array(
'IndexPager' => 'includes/Pager.php',
'Interwiki' => 'includes/interwiki/Interwiki.php',
'IP' => 'includes/IP.php',
'LCStore_Accel' => 'includes/LocalisationCache.php',
'LCStore_CDB' => 'includes/LocalisationCache.php',
'LCStore_DB' => 'includes/LocalisationCache.php',
'LCStore_Null' => 'includes/LocalisationCache.php',

63
includes/LocalisationCache.php
View file

@ -159,13 +159,8 @@ class LocalisationCache {
case 'db':
$storeClass = 'LCStore_DB';
break;
case 'accel':
case 'detect':
if ( !( wfGetCache( CACHE_ACCEL ) instanceof FakeMemCachedClient ) ) {
$storeClass = 'LCStore_Accel';
} else {
$storeClass = $wgCacheDirectory ? 'LCStore_CDB' : 'LCStore_DB';
}
$storeClass = $wgCacheDirectory ? 'LCStore_CDB' : 'LCStore_DB';
break;
default:
throw new MWException(
@ -353,9 +348,7 @@ class LocalisationCache {
}
$deps = $this->store->get( $code, 'deps' );
$keys = $this->store->get( $code, 'list', 'messages' );
// 'list:messages' sometimes expires separately of 'deps' in LCStore_Accel
if ( $deps === null || $keys === null ) {
if ( $deps === null ) {
wfDebug( __METHOD__."($code): cache missing, need to make one\n" );
return true;
}
@ -836,56 +829,6 @@ interface LCStore {
function set( $key, $value );
}
/**
* LCStore implementation which uses PHP accelerator to store data.
* This will work if one of XCache, eAccelerator, or APC cacher is configured.
* (See ObjectCache.php)
*/
class LCStore_Accel implements LCStore {
var $currentLang;
var $keys;
public function __construct() {
$this->cache = wfGetCache( CACHE_ACCEL );
}
public function get( $code, $key ) {
$k = wfMemcKey( 'l10n', $code, 'k', $key );
$r = $this->cache->get( $k );
if ( $r === false ) return null;
return $r;
}
public function startWrite( $code ) {
$k = wfMemcKey( 'l10n', $code, 'l' );
$keys = $this->cache->get( $k );
if ( $keys ) {
foreach ( $keys as $k ) {
$this->cache->delete( $k );
}
}
$this->currentLang = $code;
$this->keys = array();
}
public function finishWrite() {
if ( $this->currentLang ) {
$k = wfMemcKey( 'l10n', $this->currentLang, 'l' );
$this->cache->set( $k, array_keys( $this->keys ) );
}
$this->currentLang = null;
$this->keys = array();
}
public function set( $key, $value ) {
if ( $this->currentLang ) {
$k = wfMemcKey( 'l10n', $this->currentLang, 'k', $key );
$this->keys[$k] = true;
$this->cache->set( $k, $value );
}
}
}
/**
* LCStore implementation which uses the standard DB functions to store data.
* This will work on any MediaWiki installation.
@ -1183,4 +1126,4 @@ class LocalisationCache_BulkLoad extends LocalisationCache {
$this->unload( $code );
}
}
}
}