Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386328 )
Change subject: Rename some cache keys with odd virtual hierarchies ...................................................................... Rename some cache keys with odd virtual hierarchies This makes automatic statsd metrics more useful. Change-Id: I07d87dcb8ce9b42cc2f1c84ac4c06d177d463b1d --- M includes/Block.php M includes/page/WikiPage.php M maintenance/populateContentModel.php 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/28/386328/1 diff --git a/includes/Block.php b/includes/Block.php index 5a4c43e..8d69d9a 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -709,7 +709,7 @@ // than getting the msg raw and explode()'ing it. $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); $lines = $cache->getWithSetCallback( - $cache->makeKey( 'ipb', 'autoblock', 'whitelist' ), + $cache->makeKey( 'ip-autoblock', 'whitelist' ), $cache::TTL_DAY, function ( $curValue, &$ttl, array &$setOpts ) { $setOpts += Database::getCacheSetOptions( wfGetDB( DB_REPLICA ) ); diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index e875df5..aa26105 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -512,7 +512,7 @@ $cache = ObjectCache::getMainWANInstance(); return $cache->getWithSetCallback( - $cache->makeKey( 'page', 'content-model', $this->getLatest() ), + $cache->makeKey( 'page-content-model', $this->getLatest() ), $cache::TTL_MONTH, function () { $rev = $this->getRevision(); diff --git a/maintenance/populateContentModel.php b/maintenance/populateContentModel.php index 74a918a..d99f70a 100644 --- a/maintenance/populateContentModel.php +++ b/maintenance/populateContentModel.php @@ -69,7 +69,7 @@ } protected function clearCache( $page_id, $rev_id ) { - $contentModelKey = $this->wanCache->makeKey( 'page', 'content-model', $rev_id ); + $contentModelKey = $this->wanCache->makeKey( 'page-content-model', $rev_id ); $revisionKey = $this->wanCache->makeGlobalKey( 'revision', $this->wikiId, $page_id, $rev_id ); -- To view, visit https://gerrit.wikimedia.org/r/386328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07d87dcb8ce9b42cc2f1c84ac4c06d177d463b1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits