From 8804df2da5d0bc1b4cbd57696d770e77b76d4434 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 27 Jun 2018 08:24:00 +0100 Subject: [PATCH] filerepo: clean up remote description cache keys Hash the file name portion and make the string constant portions more relevant to what the keys are actually used for (e.g. there is no URL parameter in the key) Bug: T198279 Change-Id: Idf6f97db26f5be291cdd3a50a91346677fe9c3e6 --- includes/filerepo/file/File.php | 3 +-- includes/filerepo/file/ForeignDBFile.php | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index 546b78a0b5..370ebb406b 100644 --- a/includes/filerepo/file/File.php +++ b/includes/filerepo/file/File.php @@ -2068,9 +2068,8 @@ abstract class File implements IDBAccessObject { $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); $key = $this->repo->getLocalCacheKey( 'RemoteFileDescription', - 'url', $lang->getCode(), - $this->getName() + md5( $this->getName() ) ); return $cache->getWithSetCallback( diff --git a/includes/filerepo/file/ForeignDBFile.php b/includes/filerepo/file/ForeignDBFile.php index 05df45b32f..7a982bd34f 100644 --- a/includes/filerepo/file/ForeignDBFile.php +++ b/includes/filerepo/file/ForeignDBFile.php @@ -155,10 +155,9 @@ class ForeignDBFile extends LocalFile { return $cache->getWithSetCallback( $this->repo->getLocalCacheKey( - 'RemoteFileDescription', - 'url', + 'ForeignFileDescription', $lang->getCode(), - $this->getName(), + md5( $this->getName() ), $touched ), $this->repo->descriptionCacheExpiry ?: $cache::TTL_UNCACHEABLE, -- 2.20.1