aboutsummaryrefslogtreecommitdiffstats
path: root/includes/externalstore
diff options
context:
space:
mode:
authordaniel <daniel.kinzler@wikimedia.de>2018-07-03 17:46:30 +0200
committerdaniel <daniel.kinzler@wikimedia.de>2018-07-05 17:44:24 +0200
commit53fd8295ff186fc1d01a4f45bd8bbcd5a0bfc1d2 (patch)
tree930510e604f9fb0c02ab3f070af12ac4f123983f /includes/externalstore
parent2fd62f5dc9941cc269d6c4faa9a8fbe11975d479 (diff)
downloadmediawikicore-53fd8295ff186fc1d01a4f45bd8bbcd5a0bfc1d2.tar.gz
mediawikicore-53fd8295ff186fc1d01a4f45bd8bbcd5a0bfc1d2.zip
Use consistent caching strategy in Revision storage classes
DEPLOYMENT: This changes the cache key for revision content blobs. Expect a brief rise in ExternalStore hits. Bug: T198704 Change-Id: Icc2d16bc5a1e27ba4caea49a784ba7aeac15042a
Diffstat (limited to 'includes/externalstore')
-rw-r--r--includes/externalstore/ExternalStoreDB.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/includes/externalstore/ExternalStoreDB.php b/includes/externalstore/ExternalStoreDB.php
index 45a6bafa8862..422e1fb55363 100644
--- a/includes/externalstore/ExternalStoreDB.php
+++ b/includes/externalstore/ExternalStoreDB.php
@@ -194,6 +194,10 @@ class ExternalStoreDB extends ExternalStoreMedium {
static $externalBlobCache = [];
$cacheID = ( $itemID === false ) ? "$cluster/$id" : "$cluster/$id/";
+
+ $wiki = $this->params['wiki'] ?? false;
+ $cacheID = ( $wiki === false ) ? $cacheID : "$cacheID@$wiki";
+
if ( isset( $externalBlobCache[$cacheID] ) ) {
wfDebugLog( 'ExternalStoreDB-cache',
"ExternalStoreDB::fetchBlob cache hit on $cacheID" );