From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 8 Sep 2016 08:38:26 +0000 (-0700)
Subject: Preload ResourceLoaderWikiModule::getTitleInfo in OutputPage
X-Git-Tag: 1.31.0-rc.0~5695^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=6f8dc27ca2677c8222f1c45c63e7c3515004f4a5;p=lhc%2Fweb%2Fwiklou.git

Preload ResourceLoaderWikiModule::getTitleInfo in OutputPage

This avoids a separate query for each module.

Bug: T46362
Change-Id: Ie109a8776cbdcd5928cbb59351f2cf94088c0c95
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6ae2a925f2..9b2d8da7af 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2679,16 +2679,29 @@ class OutputPage extends ContextSource {
 			// Prepare exempt modules for buildExemptModules()
 			$exemptGroups = [ 'site' => [], 'noscript' => [], 'private' => [], 'user' => [] ];
 			$exemptStates = [];
-			$moduleStyles = array_filter( $this->getModuleStyles( /*filter*/ true ),
+			$moduleStyles = $this->getModuleStyles( /*filter*/ true );
+
+			// Batch preload getTitleInfo for isKnownEmpty() calls below
+			$exemptModules = array_filter( $moduleStyles,
+				function ( $name ) use ( $rl, &$exemptGroups ) {
+					$module = $rl->getModule( $name );
+					return $module && isset( $exemptGroups[ $module->getGroup() ] );
+				}
+			);
+			ResourceLoaderWikiModule::preloadTitleInfo(
+				$context, wfGetDB( DB_REPLICA ), $exemptModules );
+
+			// Filter out modules handled by buildExemptModules()
+			$moduleStyles = array_filter( $moduleStyles,
 				function ( $name ) use ( $rl, $context, &$exemptGroups, &$exemptStates ) {
 					$module = $rl->getModule( $name );
 					if ( $module ) {
-						$group = $module->getGroup();
 						if ( $name === 'user.styles' && $this->isUserCssPreview() ) {
 							$exemptStates[$name] = 'ready';
 							// Special case in buildExemptModules()
 							return false;
 						}
+						$group = $module->getGroup();
 						if ( isset( $exemptGroups[$group] ) ) {
 							$exemptStates[$name] = 'ready';
 							if ( !$module->isKnownEmpty( $context ) ) {