Merge "Make updateCollation wait for slaves every 500 (instead of 2000)"

diff --combined maintenance/updateCollation.php
index 2db0139,aae4195..922cc87
--- 1/maintenance/updateCollation.php
--- 2/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@@ -34,7 -34,7 +34,7 @@@ require_once __DIR__ . '/Maintenance.ph
   */
  class UpdateCollation extends Maintenance {
        const BATCH_SIZE = 100; // Number of rows to process in one batch
-       const SYNC_INTERVAL = 20; // Wait for slaves after this many batches
+       const SYNC_INTERVAL = 5; // Wait for slaves after this many batches
  
        public $sizeHistogram = [];
  
@@@ -70,7 -70,6 +70,7 @@@ TEX
                global $wgCategoryCollation;
  
                $dbw = $this->getDB( DB_MASTER );
 +              $dbr = $this->getDB( DB_SLAVE );
                $force = $this->getOption( 'force' );
                $dryRun = $this->getOption( 'dry-run' );
                $verboseStats = $this->getOption( 'verbose-stats' );
@@@ -98,7 -97,6 +98,7 @@@
                $options = [
                        'LIMIT' => self::BATCH_SIZE,
                        'ORDER BY' => $orderBy,
 +                      'STRAIGHT_JOIN' // per T58041
                ];
  
                if ( $force || $dryRun ) {
@@@ -112,7 -110,7 +112,7 @@@
                                ];
                        }
  
 -                      $count = $dbw->estimateRowCount(
 +                      $count = $dbr->estimateRowCount(
                                'categorylinks',
                                '*',
                                $collationConds,
@@@ -120,7 -118,7 +120,7 @@@
                        );
                        // Improve estimate if feasible
                        if ( $count < 1000000 ) {
 -                              $count = $dbw->selectField(
 +                              $count = $dbr->selectField(
                                        'categorylinks',
                                        'COUNT(*)',
                                        $collationConds,
@@@ -133,7 -131,6 +133,7 @@@
                                return;
                        }
                        $this->output( "Fixing collation for $count rows.\n" );
 +                      wfWaitForSlaves();
                }
                $count = 0;
                $batchCount = 0;