public static function addUpdate( DeferrableUpdate $update, $stage = self::POSTSEND ) {
global $wgCommandLineMode;
- if ( self::$executeContext && self::$executeContext['stage'] >= $stage ) {
+ if (
+ self::$executeContext &&
+ self::$executeContext['stage'] >= $stage &&
+ !( $update instanceof MergeableUpdate )
+ ) {
// This is a sub-DeferredUpdate; run it right after its parent update.
// Also, while post-send updates are running, push any "pre-send" jobs to the
// active post-send queue to make sure they get run this round (or at all).
*/
public static function doUpdates( $mode = 'run', $stage = self::ALL ) {
$stageEffective = ( $stage === self::ALL ) ? self::POSTSEND : $stage;
+ // For ALL mode, make sure that any PRESEND updates added along the way get run.
+ // Normally, these use the subqueue, but that isn't true for MergeableUpdate items.
+ do {
+ if ( $stage === self::ALL || $stage === self::PRESEND ) {
+ self::execute( self::$preSendUpdates, $mode, $stageEffective );
+ }
- if ( $stage === self::ALL || $stage === self::PRESEND ) {
- self::execute( self::$preSendUpdates, $mode, $stageEffective );
- }
-
- if ( $stage === self::ALL || $stage == self::POSTSEND ) {
- self::execute( self::$postSendUpdates, $mode, $stageEffective );
- }
+ if ( $stage === self::ALL || $stage == self::POSTSEND ) {
+ self::execute( self::$postSendUpdates, $mode, $stageEffective );
+ }
+ } while ( $stage === self::ALL && self::$preSendUpdates );
}
/**
$urls1[] = $title->getCanonicalURL( '?x=1' );
$urls1[] = $title->getCanonicalURL( '?x=2' );
$urls1[] = $title->getCanonicalURL( '?x=3' );
- $update1 = new CdnCacheUpdate( $urls1 );
+ $update1 = $this->newCdnCacheUpdate( $urls1 );
DeferredUpdates::addUpdate( $update1 );
$urls2 = [];
$urls2[] = $title->getCanonicalURL( '?x=2' );
$urls2[] = $title->getCanonicalURL( '?x=3' );
$urls2[] = $title->getCanonicalURL( '?x=4' );
- $update2 = new CdnCacheUpdate( $urls2 );
+ $update2 = $this->newCdnCacheUpdate( $urls2 );
DeferredUpdates::addUpdate( $update2 );
$wrapper = TestingAccessWrapper::newFromObject( $update1 );
$this->assertEquals( array_merge( $urls1, $urls2 ), $wrapper->urls );
+
+ $update = null;
+ DeferredUpdates::clearPendingUpdates();
+ DeferredUpdates::addCallableUpdate( function () use ( $urls1, $urls2, &$update ) {
+ $update = $this->newCdnCacheUpdate( $urls1 );
+ DeferredUpdates::addUpdate( $update );
+ DeferredUpdates::addUpdate( $this->newCdnCacheUpdate( $urls2 ) );
+ DeferredUpdates::addUpdate(
+ $this->newCdnCacheUpdate( $urls2 ), DeferredUpdates::PRESEND );
+ } );
+ DeferredUpdates::doUpdates();
+
+ $wrapper = TestingAccessWrapper::newFromObject( $update );
+ $this->assertEquals( array_merge( $urls1, $urls2 ), $wrapper->urls );
+
+ $this->assertEquals( DeferredUpdates::pendingUpdatesCount(), 0, 'PRESEND update run' );
+ }
+
+ /**
+ * @param array $urls
+ * @return CdnCacheUpdate
+ */
+ private function newCdnCacheUpdate( array $urls ) {
+ return $this->getMockBuilder( CdnCacheUpdate::class )
+ ->setConstructorArgs( [ $urls ] )
+ ->setMethods( [ 'doUpdate' ] )
+ ->getMock();
}
}