Merge "Add WAN Cache to SiteStats::jobs"

diff --combined includes/SiteStats.php
index df3e305,90fd57b..6a2d0e2
--- 1/includes/SiteStats.php
--- 2/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@@ -34,9 -34,6 +34,6 @@@ class SiteStats 
        /** @var bool */
        private static $loaded = false;
  
-       /** @var int */
-       private static $jobs;
- 
        /** @var int[] */
        private static $pageCount = [];
  
@@@ -213,17 -210,24 +210,24 @@@
        }
  
        /**
+        * Total number of jobs in the job queue.
         * @return int
         */
        static function jobs() {
-               if ( !isset( self::$jobs ) ) {
-                       try{
-                               self::$jobs = array_sum( JobQueueGroup::singleton()->getQueueSizes() );
-                       } catch ( JobQueueError $e ) {
-                               self::$jobs = 0;
-                       }
-               }
-               return self::$jobs;
+               $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+               return $cache->getWithSetCallback(
+                       $cache->makeKey( 'SiteStats', 'jobscount' ),
+                       $cache::TTL_MINUTE,
+                       function ( $oldValue, &$ttl, array &$setOpts ) {
+                               try{
+                                       $jobs = array_sum( JobQueueGroup::singleton()->getQueueSizes() );
+                               } catch ( JobQueueError $e ) {
+                                       $jobs = 0;
+                               }
+                               return $jobs;
+                       },
+                       [ 'pcTTL' => $cache::TTL_PROC_LONG ]
+               );
        }
  
        /**
@@@ -289,6 -293,7 +293,6 @@@ class SiteStatsInit 
        private $mUsers = null, $mFiles = null;
  
        /**
 -       * Constructor
         * @param bool|IDatabase $database
         * - boolean: Whether to use the master DB
         * - IDatabase: Database connection to use

diff --combined tests/phpunit/MediaWikiTestCase.php
index 31cfa70,0e920da..215d292
--- 1/tests/phpunit/MediaWikiTestCase.php
--- 2/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@@ -5,8 -5,6 +5,8 @@@ use MediaWiki\Logger\LoggerFactory
  use MediaWiki\Logger\MonologSpi;
  use MediaWiki\MediaWikiServices;
  use Psr\Log\LoggerInterface;
 +use Wikimedia\Rdbms\IMaintainableDatabase;
 +use Wikimedia\Rdbms\Database;
  use Wikimedia\TestingAccessWrapper;
  
  /**
@@@ -217,7 -215,6 +217,7 @@@ abstract class MediaWikiTestCase extend
        protected static function resetGlobalServices( Config $bootstrapConfig = null ) {
                $oldServices = MediaWikiServices::getInstance();
                $oldConfigFactory = $oldServices->getConfigFactory();
 +              $oldLoadBalancerFactory = $oldServices->getDBLoadBalancerFactory();
  
                $testConfig = self::makeTestConfig( $bootstrapConfig );
  
@@@ -226,7 -223,6 +226,7 @@@
                $serviceLocator = MediaWikiServices::getInstance();
                self::installTestServices(
                        $oldConfigFactory,
 +                      $oldLoadBalancerFactory,
                        $serviceLocator
                );
                return $serviceLocator;
@@@ -282,14 -278,12 +282,14 @@@
  
        /**
         * @param ConfigFactory $oldConfigFactory
 +       * @param LBFactory $oldLoadBalancerFactory
         * @param MediaWikiServices $newServices
         *
         * @throws MWException
         */
        private static function installTestServices(
                ConfigFactory $oldConfigFactory,
 +              LBFactory $oldLoadBalancerFactory,
                MediaWikiServices $newServices
        ) {
                // Use bootstrap config for all configuration.
@@@ -303,13 -297,6 +303,13 @@@
                                [ 'main' =>  $bootstrapConfig ]
                        )
                );
 +              $newServices->resetServiceForTesting( 'DBLoadBalancerFactory' );
 +              $newServices->redefineService(
 +                      'DBLoadBalancerFactory',
 +                      function ( MediaWikiServices $services ) use ( $oldLoadBalancerFactory ) {
 +                              return $oldLoadBalancerFactory;
 +                      }
 +              );
        }
  
        /**
@@@ -322,7 -309,7 +322,7 @@@
                ConfigFactory $oldFactory,
                array $configurations
        ) {
 -              return function( MediaWikiServices $services ) use ( $oldFactory, $configurations ) {
 +              return function ( MediaWikiServices $services ) use ( $oldFactory, $configurations ) {
                        $factory = new ConfigFactory();
  
                        // clone configurations from $oldFactory that are not overwritten by $configurations
@@@ -640,8 -627,8 +640,8 @@@
         * The key is added to the array of globals that will be reset afterwards
         * in the tearDown().
         *
 -       * @example
 -       * <code>
 +       * @par Example
 +       * @code
         *     protected function setUp() {
         *         $this->setMwGlobals( 'wgRestrictStuff', true );
         *     }
@@@ -656,7 -643,7 +656,7 @@@
         *     }
         *
         *     function testQuux() {}
 -       * </code>
 +       * @endcode
         *
         * @param array|string $pairs Key to the global variable, or an array
         *  of key/value pairs.
@@@ -842,7 -829,6 +842,7 @@@
  
                $oldInstance = MediaWikiServices::getInstance();
                $oldConfigFactory = $oldInstance->getConfigFactory();
 +              $oldLoadBalancerFactory = $oldInstance->getDBLoadBalancerFactory();
  
                $testConfig = self::makeTestConfig( null, $configOverrides );
                $newInstance = new MediaWikiServices( $testConfig );
@@@ -861,7 -847,6 +861,7 @@@
  
                self::installTestServices(
                        $oldConfigFactory,
 +                      $oldLoadBalancerFactory,
                        $newInstance
                );
                MediaWikiServices::forceGlobalInstance( $newInstance );
@@@ -1051,6 -1036,7 +1051,6 @@@
  
        private function addCoreDBData() {
                if ( $this->db->getType() == 'oracle' ) {
 -
                        # Insert 0 user to prevent FK violations
                        # Anonymous user
                        if ( !$this->db->selectField( 'user', '1', [ 'user_id' => 0 ] ) ) {
@@@ -1087,10 -1073,15 +1087,15 @@@
                        $page->doEditContent(
                                new WikitextContent( 'UTContent' ),
                                'UTPageSummary',
-                               EDIT_NEW,
+                               EDIT_NEW | EDIT_SUPPRESS_RC,
                                false,
                                $user
                        );
+                       // an edit always attempt to purge backlink links such as history
+                       // pages. That is unneccessary.
+                       JobQueueGroup::singleton()->get( 'htmlCacheUpdate' )->delete();
+                       // WikiPages::doEditUpdates randomly adds RC purges
+                       JobQueueGroup::singleton()->get( 'recentChangesUpdate' )->delete();
  
                        // doEditContent() probably started the session via
                        // User::loadFromSession(). Close it now.
@@@ -1115,8 -1106,6 +1120,8 @@@
                        return;
                }
  
 +              Hooks::run( 'UnitTestsBeforeDatabaseTeardown' );
 +
                foreach ( $wgJobClasses as $type => $class ) {
                        // Delete any jobs under the clone DB (or old prefix in other stores)
                        JobQueueGroup::singleton()->get( $type )->delete();
@@@ -1219,8 -1208,6 +1224,8 @@@
                if ( $db->getType() == 'oracle' ) {
                        $db->query( 'BEGIN FILL_WIKI_INFO; END;' );
                }
 +
 +              Hooks::run( 'UnitTestsAfterDatabaseSetup', [ $db, $prefix ] );
        }
  
        /**
@@@ -1718,6 -1705,7 +1723,6 @@@
                        if ( !isset( $wgNamespaceContentModels[$ns] ) ||
                                $wgNamespaceContentModels[$ns] === CONTENT_MODEL_WIKITEXT
                        ) {
 -
                                $wikitextNS = $ns;
  
                                return $wikitextNS;