X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpopulateParentId.php;h=2ef58b7c6154910b1160ca2512396511bbac04cd;hb=e0a3801da297d012fc67f2c128ab7e57e20f0571;hp=beb8cc8a3618b0bc6317a5b68ff7dfaa1a802cad;hpb=b67ab9de01a2eb95875d27a26eb9c30b22edf97e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateParentId.php b/maintenance/populateParentId.php
index beb8cc8a36..2ef58b7c61 100644
--- a/maintenance/populateParentId.php
+++ b/maintenance/populateParentId.php
@@ -46,6 +46,7 @@ class PopulateParentId extends LoggedUpdateMaintenance {
 	}
 
 	protected function doDBUpdates() {
+		$batchSize = $this->getBatchSize();
 		$db = $this->getDB( DB_MASTER );
 		if ( !$db->tableExists( 'revision' ) ) {
 			$this->error( "revision table does not exist" );
@@ -53,8 +54,8 @@ class PopulateParentId extends LoggedUpdateMaintenance {
 			return false;
 		}
 		$this->output( "Populating rev_parent_id column\n" );
-		$start = $db->selectField( 'revision', 'MIN(rev_id)', false, __FUNCTION__ );
-		$end = $db->selectField( 'revision', 'MAX(rev_id)', false, __FUNCTION__ );
+		$start = $db->selectField( 'revision', 'MIN(rev_id)', '', __FUNCTION__ );
+		$end = $db->selectField( 'revision', 'MAX(rev_id)', '', __FUNCTION__ );
 		if ( is_null( $start ) || is_null( $end ) ) {
 			$this->output( "...revision table seems to be empty, nothing to do.\n" );
 
@@ -62,15 +63,15 @@ class PopulateParentId extends LoggedUpdateMaintenance {
 		}
 		# Do remaining chunk
 		$blockStart = intval( $start );
-		$blockEnd = intval( $start ) + $this->mBatchSize - 1;
+		$blockEnd = intval( $start ) + $batchSize - 1;
 		$count = 0;
 		$changed = 0;
 		while ( $blockStart <= $end ) {
 			$this->output( "...doing rev_id from $blockStart to $blockEnd\n" );
 			$cond = "rev_id BETWEEN $blockStart AND $blockEnd";
 			$res = $db->select( 'revision',
-				array( 'rev_id', 'rev_page', 'rev_timestamp', 'rev_parent_id' ),
-				array( $cond, 'rev_parent_id' => null ), __METHOD__ );
+				[ 'rev_id', 'rev_page', 'rev_timestamp', 'rev_parent_id' ],
+				[ $cond, 'rev_parent_id' => null ], __METHOD__ );
 			# Go through and update rev_parent_id from these rows.
 			# Assume that the previous revision of the title was
 			# the original previous revision of the title when the
@@ -80,29 +81,29 @@ class PopulateParentId extends LoggedUpdateMaintenance {
 				# with a smaller rev ID. The highest ID "wins". This avoids loops
 				# as timestamp can only decrease and never loops with IDs (from parent to parent)
 				$previousID = $db->selectField( 'revision', 'rev_id',
-					array( 'rev_page' => $row->rev_page, 'rev_timestamp' => $row->rev_timestamp,
-						"rev_id < " . intval( $row->rev_id ) ),
+					[ 'rev_page' => $row->rev_page, 'rev_timestamp' => $row->rev_timestamp,
+						"rev_id < " . intval( $row->rev_id ) ],
 					__METHOD__,
-					array( 'ORDER BY' => 'rev_id DESC' ) );
+					[ 'ORDER BY' => 'rev_id DESC' ] );
 				# If there are none, check the highest ID with a lower timestamp
 				if ( !$previousID ) {
 					# Get the highest older timestamp
 					$lastTimestamp = $db->selectField(
 						'revision',
 						'rev_timestamp',
-						array(
+						[
 							'rev_page' => $row->rev_page,
 							"rev_timestamp < " . $db->addQuotes( $row->rev_timestamp )
-						),
+						],
 						__METHOD__,
-						array( 'ORDER BY' => 'rev_timestamp DESC' )
+						[ 'ORDER BY' => 'rev_timestamp DESC' ]
 					);
 					# If there is one, let the highest rev ID win
 					if ( $lastTimestamp ) {
 						$previousID = $db->selectField( 'revision', 'rev_id',
-							array( 'rev_page' => $row->rev_page, 'rev_timestamp' => $lastTimestamp ),
+							[ 'rev_page' => $row->rev_page, 'rev_timestamp' => $lastTimestamp ],
 							__METHOD__,
-							array( 'ORDER BY' => 'rev_id DESC' ) );
+							[ 'ORDER BY' => 'rev_id DESC' ] );
 					}
 				}
 				$previousID = intval( $previousID );
@@ -111,13 +112,13 @@ class PopulateParentId extends LoggedUpdateMaintenance {
 				}
 				# Update the row...
 				$db->update( 'revision',
-					array( 'rev_parent_id' => $previousID ),
-					array( 'rev_id' => $row->rev_id ),
+					[ 'rev_parent_id' => $previousID ],
+					[ 'rev_id' => $row->rev_id ],
 					__METHOD__ );
 				$count++;
 			}
-			$blockStart += $this->mBatchSize;
-			$blockEnd += $this->mBatchSize;
+			$blockStart += $batchSize;
+			$blockEnd += $batchSize;
 			wfWaitForSlaves();
 		}
 		$this->output( "rev_parent_id population complete ... {$count} rows [{$changed} changed]\n" );
@@ -126,5 +127,5 @@ class PopulateParentId extends LoggedUpdateMaintenance {
 	}
 }
 
-$maintClass = "PopulateParentId";
+$maintClass = PopulateParentId::class;
 require_once RUN_MAINTENANCE_IF_MAIN;