MtDu has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/355426 )
Change subject: MessageCache: Avoid deprecated wfMemcKey()
......................................................................
MessageCache: Avoid deprecated wfMemcKey()
Change-Id: I31e3cde0a94e355de9f32a17636aaf54aa2d40c4
---
M includes/cache/MessageCache.php
1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/355426/1
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 8f88ee9..04b49cd 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -220,7 +220,7 @@
* @return array|bool The cache array, or false if not in cache.
*/
protected function getLocalCache( $code ) {
- $cacheKey = wfMemcKey( __CLASS__, $code );
+ $cacheKey = $this->wanCache->makeKey( __CLASS__, $code );
return $this->srvCache->get( $cacheKey );
}
@@ -232,7 +232,7 @@
* @param array $cache The cache array
*/
protected function saveToLocalCache( $code, $cache ) {
- $cacheKey = wfMemcKey( __CLASS__, $code );
+ $cacheKey = $this->wanCache->makeKey( __CLASS__, $code );
$this->srvCache->set( $cacheKey, $cache );
}
@@ -308,7 +308,7 @@
}
if ( !$success ) {
- $cacheKey = wfMemcKey( 'messages', $code ); # Key in
memc for messages
+ $cacheKey = $cache->makeKey( 'messages', $code ); # Key
in memc for messages
# Try the global cache. If it is empty, try to acquire
a lock. If
# the lock can't be acquired, wait for the other thread
to finish
# and then try the global cache a second time.
@@ -402,7 +402,7 @@
protected function loadFromDBWithLock( $code, array &$where, $mode =
null ) {
# If cache updates on all levels fail, give up on message
overrides.
# This is to avoid easy site outages; see $saveSuccess comments
below.
- $statusKey = wfMemcKey( 'messages', $code, 'status' );
+ $statusKey = $this->wanCache->makeKey( 'messages', $code,
'status' );
$status = $this->clusterCache->get( $statusKey );
if ( $status === 'error' ) {
$where[] = "could not load; method is still globally
disabled";
@@ -416,7 +416,7 @@
# This lock is non-blocking so stale cache can quickly be used.
# Note that load() will call a blocking getReentrantScopedLock()
# after this if it really need to wait for any current thread.
- $cacheKey = wfMemcKey( 'messages', $code );
+ $cacheKey = $this->wanCache->makeKey( 'messages', $code );
$scopedLock = $this->getReentrantScopedLock( $cacheKey, 0 );
if ( !$scopedLock ) {
$where[] = 'could not acquire main lock';
@@ -596,7 +596,7 @@
function () use ( $title, $msg, $code ) {
global $wgContLang, $wgMaxMsgCacheEntrySize;
// Allow one caller at a time to avoid race
conditions
- $scopedLock = $this->getReentrantScopedLock(
wfMemcKey( 'messages', $code ) );
+ $scopedLock = $this->getReentrantScopedLock(
$this->wanCache->makeKey( 'messages', $code ) );
if ( !$scopedLock ) {
LoggerFactory::getInstance(
'MessageCache' )->error(
__METHOD__ . ': could not
acquire lock to update {title} ({code})',
@@ -628,7 +628,7 @@
// Relay the purge. Touching this check key
expires cache contents
// and local cache (APC) validation hash across
all datacenters.
- $this->wanCache->touchCheckKey( wfMemcKey(
'messages', $code ) );
+ $this->wanCache->touchCheckKey(
$this->wanCache->makeKey( 'messages', $code ) );
// Also delete cached sidebar... just in case
it is affected
// @TODO: shouldn't this be $code ===
$wgLanguageCode?
if ( $code === 'en' ) {
@@ -639,7 +639,7 @@
$codes = [ $code ];
}
foreach ( $codes as $code ) {
- $this->wanCache->delete( wfMemcKey(
'sidebar', $code ) );
+ $this->wanCache->delete(
$this->wanCache->makeKey( 'sidebar', $code ) );
}
// Purge the message in the message blob store
@@ -684,7 +684,7 @@
*/
protected function saveToCaches( array $cache, $dest, $code = false ) {
if ( $dest === 'all' ) {
- $cacheKey = wfMemcKey( 'messages', $code );
+ $cacheKey = $this->wanCache->makeKey( 'messages', $code
);
$success = $this->clusterCache->set( $cacheKey, $cache
);
$this->setValidationHash( $code, $cache );
} else {
@@ -707,7 +707,7 @@
$value = $this->wanCache->get(
$this->wanCache->makeKey( 'messages', $code, 'hash',
'v1' ),
$curTTL,
- [ wfMemcKey( 'messages', $code ) ]
+ [ $this->wanCache->makeKey( 'messages', $code ) ]
);
if ( $value ) {
@@ -1212,7 +1212,7 @@
$langs = Language::fetchLanguageNames( null, 'mw' );
foreach ( array_keys( $langs ) as $code ) {
# Global and local caches
- $this->wanCache->touchCheckKey( wfMemcKey( 'messages',
$code ) );
+ $this->wanCache->touchCheckKey(
$this->wanCache->makeKey( 'messages', $code ) );
}
$this->mLoadedLanguages = [];
--
To view, visit https://gerrit.wikimedia.org/r/355426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I31e3cde0a94e355de9f32a17636aaf54aa2d40c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MtDu <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
