diff options
Diffstat (limited to 'includes/ObjectCache.php')
| -rw-r--r-- | includes/ObjectCache.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php index 01b61dfb..6cfb2340 100644 --- a/includes/ObjectCache.php +++ b/includes/ObjectCache.php @@ -32,7 +32,10 @@ class FakeMemCachedClient { global $wgCaches; $wgCaches = array(); -/** @todo document */ +/** + * Get a cache object. + * @param int $inputType cache type, one the the CACHE_* constants. + */ function &wfGetCache( $inputType ) { global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent; $cache = false; @@ -48,23 +51,20 @@ function &wfGetCache( $inputType ) { } if ( $type == CACHE_MEMCACHED ) { - if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ){ - require_once( 'memcached-client.php' ); - - if (!class_exists("MemcachedClientforWiki")) { + if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ) { + if ( !class_exists( 'MemcachedClientforWiki' ) ) { class MemCachedClientforWiki extends memcached { function _debugprint( $text ) { wfDebug( "memcached: $text" ); } } } - - $wgCaches[CACHE_DB] = new MemCachedClientforWiki( + $wgCaches[CACHE_MEMCACHED] = new MemCachedClientforWiki( array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) ); - $cache =& $wgCaches[CACHE_DB]; - $cache->set_servers( $wgMemCachedServers ); - $cache->set_debug( $wgMemCachedDebug ); + $wgCaches[CACHE_MEMCACHED]->set_servers( $wgMemCachedServers ); + $wgCaches[CACHE_MEMCACHED]->set_debug( $wgMemCachedDebug ); } + $cache =& $wgCaches[CACHE_MEMCACHED]; } elseif ( $type == CACHE_ACCEL ) { if ( !array_key_exists( CACHE_ACCEL, $wgCaches ) ) { if ( function_exists( 'eaccelerator_get' ) ) { @@ -106,18 +106,21 @@ function &wfGetCache( $inputType ) { return $cache; } +/** Get the main cache object */ function &wfGetMainCache() { global $wgMainCacheType; $ret =& wfGetCache( $wgMainCacheType ); return $ret; } +/** Get the cache object used by the message cache */ function &wfGetMessageCacheStorage() { global $wgMessageCacheType; $ret =& wfGetCache( $wgMessageCacheType ); return $ret; } +/** Get the cache object used by the parser cache */ function &wfGetParserCacheStorage() { global $wgParserCacheType; $ret =& wfGetCache( $wgParserCacheType ); |