From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 27 Aug 2015 09:10:03 +0000 (-0700)
Subject: Made MessageCache use the WAN cache for individual cache keys
X-Git-Tag: 1.31.0-rc.0~10219
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=846769fad1704a0e40526a34ca36c663da7f08ee;p=lhc%2Fweb%2Fwiklou.git

Made MessageCache use the WAN cache for individual cache keys

* These keys are used for larger messages not in the main blob,
  and they still use explicit purges as the pages change

Change-Id: I254ddcc9ffe7c49654788d6aabcca2ab7ed4f03f
---

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index fef544ac83..142dacf6e3 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -559,14 +559,14 @@ class MessageCache {
 		if ( $text === false ) {
 			# Article was deleted
 			$this->mCache[$code][$title] = '!NONEXISTENT';
-			$this->mMemc->delete( $titleKey );
+			$this->wanCache->delete( $titleKey );
 		} elseif ( strlen( $text ) > $wgMaxMsgCacheEntrySize ) {
 			# Check for size
 			$this->mCache[$code][$title] = '!TOO BIG';
-			$this->mMemc->set( $titleKey, ' ' . $text, $this->mExpiry );
+			$this->wanCache->set( $titleKey, ' ' . $text, $this->mExpiry );
 		} else {
 			$this->mCache[$code][$title] = ' ' . $text;
-			$this->mMemc->delete( $titleKey );
+			$this->wanCache->delete( $titleKey );
 		}
 
 		# Update caches
@@ -920,7 +920,7 @@ class MessageCache {
 
 		# Try the individual message cache
 		$titleKey = wfMemcKey( 'messages', 'individual', $title );
-		$entry = $this->mMemc->get( $titleKey );
+		$entry = $this->wanCache->get( $titleKey );
 		if ( $entry ) {
 			if ( substr( $entry, 0, 1 ) === ' ' ) {
 				$this->mCache[$code][$title] = $entry;
@@ -934,7 +934,7 @@ class MessageCache {
 				return false;
 			} else {
 				# Corrupt/obsolete entry, delete it
-				$this->mMemc->delete( $titleKey );
+				$this->wanCache->delete( $titleKey );
 			}
 		}
 
@@ -968,7 +968,7 @@ class MessageCache {
 					$message = false; // negative caching
 				} else {
 					$this->mCache[$code][$title] = ' ' . $message;
-					$this->mMemc->set( $titleKey, ' ' . $message, $this->mExpiry );
+					$this->wanCache->set( $titleKey, ' ' . $message, $this->mExpiry );
 				}
 			}
 		} else {
@@ -977,7 +977,7 @@ class MessageCache {
 
 		if ( $message === false ) { // negative caching
 			$this->mCache[$code][$title] = '!NONEXISTENT';
-			$this->mMemc->set( $titleKey, '!NONEXISTENT', $this->mExpiry );
+			$this->wanCache->set( $titleKey, '!NONEXISTENT', $this->mExpiry );
 		}
 
 		return $message;