jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/352623 )
Change subject: Prettify MessageCache::loadFromDB()-small query ...................................................................... Prettify MessageCache::loadFromDB()-small query Adjust the call so it uses JOIN...ON syntax rather than comma joins. Bug: T164666 Change-Id: I93c8569620d543e9507d0adf1283443915f50d4b --- M includes/cache/MessageCache.php 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified Jcrespo: Looks good to me, but someone else must approve diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php index 5caa7d5..c992112 100644 --- a/includes/cache/MessageCache.php +++ b/includes/cache/MessageCache.php @@ -515,15 +515,18 @@ # Conditions to load the remaining pages with their contents $smallConds = $conds; - $smallConds[] = 'page_latest=rev_id'; - $smallConds[] = 'rev_text_id=old_id'; $smallConds[] = 'page_len <= ' . intval( $wgMaxMsgCacheEntrySize ); $res = $dbr->select( [ 'page', 'revision', 'text' ], [ 'page_title', 'old_id', 'old_text', 'old_flags' ], $smallConds, - __METHOD__ . "($code)-small" + __METHOD__ . "($code)-small", + [], + [ + 'revision' => [ 'JOIN', 'page_latest=rev_id' ], + 'text' => [ 'JOIN', 'rev_text_id=old_id' ], + ] ); foreach ( $res as $row ) { -- To view, visit https://gerrit.wikimedia.org/r/352623 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93c8569620d543e9507d0adf1283443915f50d4b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Anomie <bjor...@wikimedia.org> Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits