From f0a80ea778057379a16e277348ab5e11d939b137 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 8 May 2017 13:57:13 -0400 Subject: [PATCH] Prettify MessageCache::loadFromDB()-small query Adjust the call so it uses JOIN...ON syntax rather than comma joins. Bug: T164666 Change-Id: I93c8569620d543e9507d0adf1283443915f50d4b --- includes/cache/MessageCache.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php index 5caa7d5f35..c992112068 100644 --- a/includes/cache/MessageCache.php +++ b/includes/cache/MessageCache.php @@ -515,15 +515,18 @@ class MessageCache { # 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 ) { -- 2.20.1