X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FupdateCollation.php;h=06704549470bd19c55a27b47e83f4f688afe7196;hb=1658759d42a5d802e29a71c3fd70ae127afd3e46;hp=63176cb6ef4fb0f87f20a6c39a32ac8b45a75bf9;hpb=5612400c8271ac2762fd2ce9acfcc9a58e47f0ee;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 63176cb6ef..0670454947 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -187,20 +187,18 @@ TEXT
 				}
 				# cl_type will be wrong for lots of pages if cl_collation is 0,
 				# so let's update it while we're here.
-				if ( $title->getNamespace() == NS_CATEGORY ) {
-					$type = 'subcat';
-				} elseif ( $title->getNamespace() == NS_FILE ) {
-					$type = 'file';
-				} else {
-					$type = 'page';
-				}
+				$type = MWNamespace::getCategoryLinkType( $title->getNamespace() );
 				$newSortKey = $collation->getSortKey(
 					$title->getCategorySortkey( $prefix ) );
 				if ( $verboseStats ) {
 					$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',
 						[
@@ -213,6 +211,7 @@ TEXT
 						[ 'cl_from' => $row->cl_from, 'cl_to' => $row->cl_to ],
 						__METHOD__
 					);
+					$count++;
 				}
 				if ( $row ) {
 					$batchConds = [ $this->getBatchCondition( $row, $dbw ) ];
@@ -222,17 +221,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" );