Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

messagecache: check overridable message array in getMsgFromNamespace()

Browse source 
Follow up to a3d6c1411d.

This avoids extra queries for messages that have a software defined value.

Bug: T193271
Change-Id: I25aa0e27200a0b417721cf1fbd34a82095405b89
This commit is contained in:
Aaron Schulz 2018-10-15 08:08:24 -07:00 committed by Krinkle
parent d1592cdf05
commit 4fc5ba8bf8
2 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
includes/cache/MessageCache.php vendored
View file

@ -52,6 +52,13 @@ class MessageCache {
*/
protected $cache;
/**
* Map of (lowercase message key => index) for all software defined messages
*
* @var array
*/
protected $overridable;
/**
* @var bool[] Map of (language code => boolean)
*/
@ -258,6 +265,8 @@ class MessageCache {
return true;
}
$this->overridable = array_flip( Language::getMessageKeysFor( $code ) );
# 8 lines of code just to say (once) that message cache is disabled
if ( $this->mDisable ) {
static $shownDisabled = false;
@ -1029,14 +1038,18 @@ class MessageCache {
$this->cache->getField( $code, 'HASH' )
);
} else {
// Message page does not exist or does not override a software message.
// Load the message page, utilizing the individual message cache.
$entry = $this->loadCachedMessagePageEntry(
$title,
$code,
$this->cache->getField( $code, 'HASH' )
);
if ( substr( $entry, 0, 1 ) !== ' ' ) {
// Message page either does not exist or does not override a software message
if ( !isset( $this->overridable[$this->contLang->lcfirst( $title )] ) ) {
// Message page does not override any software-defined message. A custom
// message might be defined to have content or settings specific to the wiki.
// Load the message page, utilizing the individual message cache as needed.
$entry = $this->loadCachedMessagePageEntry(
$title,
$code,
$this->cache->getField( $code, 'HASH' )
);
}
if ( $entry === null || substr( $entry, 0, 1 ) !== ' ' ) {
// Message does not have a MediaWiki page definition; try hook handlers
$message = false;
Hooks::run( 'MessagesPreLoad', [ $title, &$message, $code ] );

17
tests/phpunit/includes/cache/MessageCacheTest.php vendored
View file

@ -196,4 +196,21 @@ class MessageCacheTest extends MediaWikiLangTestCase {
[ 'ćaB', 'ćaB' ],
];
}
public function testNoDBAccess() {
global $wgContLanguageCode;
$dbr = wfGetDB( DB_REPLICA );
MessageCache::singleton()->getMsgFromNamespace( 'allpages', $wgContLanguageCode );
$this->assertEquals( 0, $dbr->trxLevel() );
$dbr->setFlag( DBO_TRX, $dbr::REMEMBER_PRIOR ); // make queries trigger TRX
MessageCache::singleton()->getMsgFromNamespace( 'go', $wgContLanguageCode );
$dbr->restoreFlags();
$this->assertEquals( 0, $dbr->trxLevel(), "No DB read queries" );
}
}