[MediaWiki-commits] [Gerrit] Language: Convert names cache from MapCacheLRU to HashBagOStuff - change (mediawiki/core)

2015-11-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Language: Convert names cache from MapCacheLRU to HashBagOStuff
..


Language: Convert names cache from MapCacheLRU to HashBagOStuff

Change-Id: I3237c8ed97d23e82caa171d936ecb5745a2fe3d5
---
M languages/Language.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/Language.php b/languages/Language.php
index c7871c1..7747198 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -147,7 +147,7 @@
 
/**
 * Cache for language names
-* @var MapCacheLRU|null
+* @var HashBagOStuff|null
 */
static private $languageNameCache;
 
@@ -851,11 +851,11 @@
$cacheKey = $inLanguage === null ? 'null' : $inLanguage;
$cacheKey .= ":$include";
if ( self::$languageNameCache === null ) {
-   self::$languageNameCache = new MapCacheLRU( 20 );
+   self::$languageNameCache = new HashBagOStuff( array( 
'maxKeys' => 20 ) );
}
-   if ( self::$languageNameCache->has( $cacheKey ) ) {
-   $ret = self::$languageNameCache->get( $cacheKey );
-   } else {
+
+   $ret = self::$languageNameCache->get( $cacheKey );
+   if ( !$ret ) {
$ret = self::fetchLanguageNamesUncached( $inLanguage, 
$include );
self::$languageNameCache->set( $cacheKey, $ret );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/252129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3237c8ed97d23e82caa171d936ecb5745a2fe3d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Language: Convert names cache from MapCacheLRU to HashBagOStuff - change (mediawiki/core)

2015-11-09 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252129

Change subject: Language: Convert names cache from MapCacheLRU to HashBagOStuff
..

Language: Convert names cache from MapCacheLRU to HashBagOStuff

Change-Id: I3237c8ed97d23e82caa171d936ecb5745a2fe3d5
---
M languages/Language.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/252129/1

diff --git a/languages/Language.php b/languages/Language.php
index c7871c1..7747198 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -147,7 +147,7 @@
 
/**
 * Cache for language names
-* @var MapCacheLRU|null
+* @var HashBagOStuff|null
 */
static private $languageNameCache;
 
@@ -851,11 +851,11 @@
$cacheKey = $inLanguage === null ? 'null' : $inLanguage;
$cacheKey .= ":$include";
if ( self::$languageNameCache === null ) {
-   self::$languageNameCache = new MapCacheLRU( 20 );
+   self::$languageNameCache = new HashBagOStuff( array( 
'maxKeys' => 20 ) );
}
-   if ( self::$languageNameCache->has( $cacheKey ) ) {
-   $ret = self::$languageNameCache->get( $cacheKey );
-   } else {
+
+   $ret = self::$languageNameCache->get( $cacheKey );
+   if ( !$ret ) {
$ret = self::fetchLanguageNamesUncached( $inLanguage, 
$include );
self::$languageNameCache->set( $cacheKey, $ret );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/252129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3237c8ed97d23e82caa171d936ecb5745a2fe3d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits