From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 3 Jun 2015 23:51:47 +0000 (+0000)
Subject: Merge "hierarchicalize(!) stat names"
X-Git-Tag: 1.31.0-rc.0~11184
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=111150890c28eee1d561e91c4101009e5e5e3227;p=lhc%2Fweb%2Fwiklou.git

Merge "hierarchicalize(!) stat names"
---

111150890c28eee1d561e91c4101009e5e5e3227
diff --cc includes/resourceloader/ResourceLoader.php
index ccc7a1796a,9970a89ac5..5bc9dc3cba
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@@ -195,11 -195,12 +195,11 @@@ class ResourceLoader 
  		if ( !$options['cache'] ) {
  			$result = $this->applyFilter( $filter, $data );
  		} else {
 -			// Use CACHE_ANYTHING since filtering is very slow compared to DB queries
  			$key = wfMemcKey( 'resourceloader', 'filter', $filter, self::$filterCacheVersion, md5( $data ) );
 -			$cache = wfGetCache( CACHE_ANYTHING );
 +			$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING );
  			$cacheEntry = $cache->get( $key );
  			if ( is_string( $cacheEntry ) ) {
- 				wfIncrStats( "rl-$filter-cache-hits" );
+ 				wfIncrStats( "resourceloader_cache.$filter.hit" );
  				return $cacheEntry;
  			}
  			$result = '';