X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStorage%2FDerivedPageDataUpdater.php;h=bc48a0e7bd3a87ced72f94ab5a63c5f6bfce8774;hb=e633eba0f73768b2209c1e8c988b4c4b15249b0f;hp=d5c1656505a23e1298a765a48316c3e857bf8209;hpb=c81d40df044ee94713f4e607a391c71bc744a7cb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php
index d5c1656505..bc48a0e7bd 100644
--- a/includes/Storage/DerivedPageDataUpdater.php
+++ b/includes/Storage/DerivedPageDataUpdater.php
@@ -22,7 +22,6 @@
 
 namespace MediaWiki\Storage;
 
-use ApiStashEdit;
 use CategoryMembershipChangeJob;
 use Content;
 use ContentHandler;
@@ -38,6 +37,7 @@ use LinksDeletionUpdate;
 use LinksUpdate;
 use LogicException;
 use MediaWiki\Edit\PreparedEdit;
+use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RenderedRevision;
 use MediaWiki\Revision\RevisionRecord;
@@ -750,17 +750,17 @@ class DerivedPageDataUpdater implements IDBAccessObject {
 
 		$parentRevision = $this->grabCurrentRevision();
 
-		$this->slotsOutput = [];
-		$this->canonicalParserOutput = null;
-
 		// The edit may have already been prepared via api.php?action=stashedit
 		$stashedEdit = false;
 
 		// TODO: MCR: allow output for all slots to be stashed.
 		if ( $useStash && $slotsUpdate->isModifiedSlot( SlotRecord::MAIN ) ) {
-			$mainContent = $slotsUpdate->getModifiedSlot( SlotRecord::MAIN )->getContent();
-			$legacyUser = User::newFromIdentity( $user );
-			$stashedEdit = ApiStashEdit::checkCache( $title, $mainContent, $legacyUser );
+			$editStash = MediaWikiServices::getInstance()->getPageEditStash();
+			$stashedEdit = $editStash->checkCache(
+				$title,
+				$slotsUpdate->getModifiedSlot( SlotRecord::MAIN )->getContent(),
+				User::newFromIdentity( $user )
+			);
 		}
 
 		$userPopts = ParserOptions::newFromUserAndLang( $user, $this->contLang );
@@ -1242,7 +1242,7 @@ class DerivedPageDataUpdater implements IDBAccessObject {
 		$preparedEdit = new PreparedEdit();
 
 		$preparedEdit->popts = $this->getCanonicalParserOptions();
-		$preparedEdit->output = $this->getCanonicalParserOutput();
+		$preparedEdit->parserOutputCallback = [ $this, 'getCanonicalParserOutput' ];
 		$preparedEdit->pstContent = $this->revision->getContent( SlotRecord::MAIN );
 		$preparedEdit->newContent =
 			$slotsUpdate->isModifiedSlot( SlotRecord::MAIN )
@@ -1404,13 +1404,31 @@ class DerivedPageDataUpdater implements IDBAccessObject {
 		$legacyUser = User::newFromIdentity( $this->user );
 		$legacyRevision = new Revision( $this->revision );
 
-		$this->doParserCacheUpdate();
+		$userParserOptions = ParserOptions::newFromUser( $legacyUser );
+		// Decide whether to save the final canonical parser ouput based on the fact that
+		// users are typically redirected to viewing pages right after they edit those pages.
+		// Due to vary-revision-id, getting/saving that output here might require a reparse.
+		if ( $userParserOptions->matchesForCacheKey( $this->getCanonicalParserOptions() ) ) {
+			// Whether getting the final output requires a reparse or not, the user will
+			// need canonical output anyway, since that is what their parser options use.
+			// A reparse now at least has the benefit of various warm process caches.
+			$this->doParserCacheUpdate();
+		} else {
+			// If the user does not have canonical parse options, then don't risk another parse
+			// to make output they cannot use on the page refresh that typically occurs after
+			// editing. Doing the parser output save post-send will still benefit *other* users.
+			DeferredUpdates::addCallableUpdate( function () {
+				$this->doParserCacheUpdate();
+			} );
+		}
 
-		$this->doSecondaryDataUpdates( [
-			// T52785 do not update any other pages on a null edit
-			'recursive' => $this->options['changed'],
-			'defer' => DeferredUpdates::POSTSEND,
-		] );
+		// Defer the getCannonicalParserOutput() call triggered by getSecondaryDataUpdates()
+		DeferredUpdates::addCallableUpdate( function () {
+			$this->doSecondaryDataUpdates( [
+				// T52785 do not update any other pages on a null edit
+				'recursive' => $this->options['changed']
+			] );
+		} );
 
 		// TODO: MCR: check if *any* changed slot supports categories!
 		if ( $this->rcWatchCategoryMembership
@@ -1430,8 +1448,11 @@ class DerivedPageDataUpdater implements IDBAccessObject {
 		}
 
 		// TODO: replace legacy hook! Use a listener on PageEventEmitter instead!
+		// @note: Extensions should *avoid* calling getCannonicalParserOutput() when using
+		// this hook whenever possible in order to avoid unnecessary additional parses.
 		$editInfo = $this->getPreparedEdit();
-		Hooks::run( 'ArticleEditUpdates', [ &$wikiPage, &$editInfo, $this->options['changed'] ] );
+		Hooks::run( 'ArticleEditUpdates',
+			[ &$wikiPage, &$editInfo, $this->options['changed'] ] );
 
 		// TODO: replace legacy hook! Use a listener on PageEventEmitter instead!
 		if ( Hooks::run( 'ArticleEditUpdatesDeleteFromRecentchanges', [ &$wikiPage ] ) ) {
@@ -1453,27 +1474,30 @@ class DerivedPageDataUpdater implements IDBAccessObject {
 			return;
 		}
 
-		if ( $this->options['oldcountable'] === 'no-change' ||
-			( !$this->options['changed'] && !$this->options['moved'] )
-		) {
-			$good = 0;
-		} elseif ( $this->options['created'] ) {
-			$good = (int)$this->isCountable();
-		} elseif ( $this->options['oldcountable'] !== null ) {
-			$good = (int)$this->isCountable()
-				- (int)$this->options['oldcountable'];
-		} elseif ( isset( $this->pageState['oldCountable'] ) ) {
-			$good = (int)$this->isCountable()
-				- (int)$this->pageState['oldCountable'];
-		} else {
-			$good = 0;
-		}
-		$edits = $this->options['changed'] ? 1 : 0;
-		$pages = $this->options['created'] ? 1 : 0;
+		DeferredUpdates::addCallableUpdate( function () {
+			if (
+				$this->options['oldcountable'] === 'no-change' ||
+				( !$this->options['changed'] && !$this->options['moved'] )
+			) {
+				$good = 0;
+			} elseif ( $this->options['created'] ) {
+				$good = (int)$this->isCountable();
+			} elseif ( $this->options['oldcountable'] !== null ) {
+				$good = (int)$this->isCountable()
+					- (int)$this->options['oldcountable'];
+			} elseif ( isset( $this->pageState['oldCountable'] ) ) {
+				$good = (int)$this->isCountable()
+					- (int)$this->pageState['oldCountable'];
+			} else {
+				$good = 0;
+			}
+			$edits = $this->options['changed'] ? 1 : 0;
+			$pages = $this->options['created'] ? 1 : 0;
 
-		DeferredUpdates::addUpdate( SiteStatsUpdate::factory(
-			[ 'edits' => $edits, 'articles' => $good, 'pages' => $pages ]
-		) );
+			DeferredUpdates::addUpdate( SiteStatsUpdate::factory(
+				[ 'edits' => $edits, 'articles' => $good, 'pages' => $pages ]
+			) );
+		} );
 
 		// TODO: make search infrastructure aware of slots!
 		$mainSlot = $this->revision->getSlot( SlotRecord::MAIN );