X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FupdateCollation.php;h=d88d5e968e56bdfbbc6bdaf62106e5ca52528585;hb=6066f6c063af9622b005218976ed018b36254e42;hp=e70a176909f8108c120c169eaed1a7fd6b8be020;hpb=9964ca1a390c446397dcd466916ffed356cdc3c9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index e70a176909..d88d5e968e 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -26,6 +26,8 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use Wikimedia\Rdbms\IDatabase;
+
 /**
  * Maintenance script that will find all rows in the categorylinks table
  * whose collation is out-of-date.
@@ -198,7 +200,11 @@ TEXT
 					$this->updateSortKeySizeHistogram( $newSortKey );
 				}
 
-				if ( !$dryRun ) {
+				if ( $dryRun ) {
+					// Add 1 to the count if the sortkey was changed. (Note that this doesn't count changes in
+					// other fields, if any, those usually only happen when upgrading old MediaWikis.)
+					$count += ( $row->cl_sortkey !== $newSortKey );
+				} else {
 					$dbw->update(
 						'categorylinks',
 						[
@@ -211,6 +217,7 @@ TEXT
 						[ 'cl_from' => $row->cl_from, 'cl_to' => $row->cl_to ],
 						__METHOD__
 					);
+					$count++;
 				}
 				if ( $row ) {
 					$batchConds = [ $this->getBatchCondition( $row, $dbw ) ];
@@ -220,17 +227,16 @@ TEXT
 				$this->commitTransaction( $dbw, __METHOD__ );
 			}
 
-			$count += $res->numRows();
-			$this->output( "$count done.\n" );
-
-			if ( !$dryRun && ++$batchCount % self::SYNC_INTERVAL == 0 ) {
-				$this->output( "Waiting for replica DBs ... " );
-				wfWaitForSlaves();
-				$this->output( "done\n" );
+			if ( $dryRun ) {
+				$this->output( "$count rows would be updated so far.\n" );
+			} else {
+				$this->output( "$count done.\n" );
 			}
 		} while ( $res->numRows() == self::BATCH_SIZE );
 
-		$this->output( "$count rows processed\n" );
+		if ( !$dryRun ) {
+			$this->output( "$count rows processed\n" );
+		}
 
 		if ( $verboseStats ) {
 			$this->output( "\n" );
@@ -242,7 +248,7 @@ TEXT
 	 * Return an SQL expression selecting rows which sort above the given row,
 	 * assuming an ordering of cl_collation, cl_to, cl_type, cl_from
 	 * @param stdClass $row
-	 * @param Database $dbw
+	 * @param IDatabase $dbw
 	 * @return string
 	 */
 	function getBatchCondition( $row, $dbw ) {
@@ -342,5 +348,5 @@ TEXT
 	}
 }
 
-$maintClass = "UpdateCollation";
+$maintClass = UpdateCollation::class;
 require_once RUN_MAINTENANCE_IF_MAIN;