From d3f36ffd4d263861f475da4b45c98a95e8840431 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Thu, 3 Mar 2011 04:48:14 +0000 Subject: [PATCH] More renames and splits for objectcache reorganisation. --- includes/AutoLoader.php | 6 ++--- .../MemcachedClient.php} | 0 includes/objectcache/ObjectCache.php | 25 ------------------- 3 files changed, 3 insertions(+), 28 deletions(-) rename includes/{memcached-client.php => objectcache/MemcachedClient.php} (100%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 8717648b56..705d7e8fea 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -158,7 +158,6 @@ $wgAutoloadLocalClasses = array( 'MathRenderer' => 'includes/Math.php', 'MediaWiki_I18N' => 'includes/SkinTemplate.php', 'MediaWiki' => 'includes/Wiki.php', - 'MemCachedClientforWiki' => 'includes/memcached-client.php', 'Message' => 'includes/Message.php', 'MessageBlobStore' => 'includes/MessageBlobStore.php', 'MessageCache' => 'includes/MessageCache.php', @@ -166,7 +165,6 @@ $wgAutoloadLocalClasses = array( 'MWException' => 'includes/Exception.php', 'MWFunction' => 'includes/MWFunction.php', 'MWHttpRequest' => 'includes/HttpFunctions.php', - 'MWMemcached' => 'includes/memcached-client.php', 'MWNamespace' => 'includes/Namespace.php', 'OldChangesList' => 'includes/ChangesList.php', 'OutputPage' => 'includes/OutputPage.php', @@ -506,13 +504,15 @@ $wgAutoloadLocalClasses = array( 'APCBagOStuff' => 'includes/objectcache/APCBagOStuff.php', 'BagOStuff' => 'includes/objectcache/BagOStuff.php', 'DBABagOStuff' => 'includes/objectcache/DBABagOStuff.php', + 'eAccelBagOStuff' => 'includes/objectcache/eAccelBagOStuff.php', 'FakeMemCachedClient' => 'includes/objectcache/ObjectCache.php', 'HashBagOStuff' => 'includes/objectcache/HashBagOStuff.php', + 'MWMemcached' => 'includes/objectcache/MemcachedClient.php', 'MediaWikiBagOStuff' => 'includes/objectcache/SqlBagOStuff.php', + 'MemCachedClientforWiki' => 'includes/objectcache/MemcachedClient.php', 'SqlBagOStuff' => 'includes/objectcache/SqlBagOStuff.php', 'WinCacheBagOStuff' => 'includes/objectcache/WinCacheBagOStuff.php', 'XCacheBagOStuff' => 'includes/objectcache/XCacheBagOStuff.php', - 'eAccelBagOStuff' => 'includes/objectcache/eAccelBagOStuff.php', # includes/parser 'CoreLinkFunctions' => 'includes/parser/CoreLinkFunctions.php', diff --git a/includes/memcached-client.php b/includes/objectcache/MemcachedClient.php similarity index 100% rename from includes/memcached-client.php rename to includes/objectcache/MemcachedClient.php diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php index 6824d21e74..74b7dcd4ee 100644 --- a/includes/objectcache/ObjectCache.php +++ b/includes/objectcache/ObjectCache.php @@ -6,31 +6,6 @@ * @ingroup Cache */ -/** - * FakeMemCachedClient imitates the API of memcached-client v. 0.1.2. - * It acts as a memcached server with no RAM, that is, all objects are - * cleared the moment they are set. All set operations succeed and all - * get operations return null. - * @ingroup Cache - */ -class FakeMemCachedClient { - function add ($key, $val, $exp = 0) { return true; } - function decr ($key, $amt=1) { return null; } - function delete ($key, $time = 0) { return false; } - function disconnect_all () { } - function enable_compress ($enable) { } - function forget_dead_hosts () { } - function get ($key) { return null; } - function get_multi ($keys) { return array_pad(array(), count($keys), null); } - function incr ($key, $amt=1) { return null; } - function replace ($key, $value, $exp=0) { return false; } - function run_command ($sock, $cmd) { return null; } - function set ($key, $value, $exp=0){ return true; } - function set_compress_threshold ($thresh){ } - function set_debug ($dbg) { } - function set_servers ($list) { } -} - global $wgCaches; $wgCaches = array(); -- 2.20.1