From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 1 Jul 2015 03:33:13 +0000 (+0100)
Subject: resourceloader: Make minify cache keys globally shared instead of local
X-Git-Tag: 1.31.0-rc.0~10921
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=9bd84c11d22bc593c3c6b3f18142f3203217570e;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Make minify cache keys globally shared instead of local

The keys already contain a hash of the contents and the version of
the filter system. No need for these to be fragmented by wiki.

Previously wiki farms would minify the same module build for
every wiki. For e.g. Wikimedia this should bring down minification
runs for a new module version from ~800x to something lower.
It won't be 1 since modules may still vary by language, or config.

This should speed up load.php responses when a new module version
is deployed.

It will also reduce response time for page views of logged-in
users due to improved minification cache of embedded modules.

Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 04b6fec399..5d0ed3c51b 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -206,7 +206,7 @@ class ResourceLoader implements LoggerAwareInterface {
 		if ( !$options['cache'] ) {
 			$result = $this->applyFilter( $filter, $data );
 		} else {
-			$key = wfMemcKey( 'resourceloader', 'filter', $filter, self::$filterCacheVersion, md5( $data ) );
+			$key = wfGlobalCacheKey( 'resourceloader', 'filter', $filter, self::$filterCacheVersion, md5( $data ) );
 			$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING );
 			$cacheEntry = $cache->get( $key );
 			if ( is_string( $cacheEntry ) ) {