X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FupdateRestrictions.php;h=59879eaa5e5bdbf61d3d28b795bf1d11711ce74c;hb=6543842e52a088f581688dda790450999e303c46;hp=caf0f431b6e5049e8fb8cc867d59675a137cc6cc;hpb=d69f04ec81728195fe05a42c1d3f645e8d20c092;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index caf0f431b6..59879eaa5e 100644
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -1,10 +1,12 @@
 <?php
-
-/*
+/**
  * Makes the required database updates for Special:ProtectedPages
  * to show all protected pages, even ones before the page restrictions
  * schema change. All remaining page_restriction column values are moved
  * to the new table.
+ *
+ * @file
+ * @ingroup Maintenance
  */
 
 define( 'BATCH_SIZE', 100 );
@@ -20,28 +22,41 @@ if ( !$db->tableExists( 'page_restrictions' ) ) {
 migrate_page_restrictions( $db );
 
 function migrate_page_restrictions( $db ) {
-	
 	$start = $db->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
+	if( !$start ) {
+		die("Nothing to do.\n");
+	}
 	$end = $db->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+	
+	# Do remaining chunk
+	$end += BATCH_SIZE - 1;
 	$blockStart = $start;
 	$blockEnd = $start + BATCH_SIZE - 1;
-	$encodedExpiry = Block::decodeExpiry('');
-	while ( $blockEnd <= $end ) {
-		$cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_rescrictions !=''";
-		$res = $db->select( 'page', array('page_id', 'page_restrictions'), $cond, __FUNCTION__ );
+	$encodedExpiry = 'infinity';
+	while( $blockEnd <= $end ) {
+		echo "...doing page_id from $blockStart to $blockEnd\n";
+		$cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !=''";
+		$res = $db->select( 'page', array('page_id','page_namespace','page_restrictions'), $cond, __FUNCTION__ );
 		$batch = array();
-		while ( $row = $db->fetchObject( $res ) ) {
+		while( $row = $db->fetchObject( $res ) ) {
 			$oldRestrictions = array();
 			foreach( explode( ':', trim( $row->page_restrictions ) ) as $restrict ) {
 				$temp = explode( '=', trim( $restrict ) );
-				if(count($temp) == 1) {
+				// Make sure we are not settings restrictions to ""
+				if( count($temp) == 1 && $temp[0] ) {
 					// old old format should be treated as edit/move restriction
-					$oldRestrictions["edit"] = explode( ',', trim( $temp[0] ) );
-					$oldRestrictions["move"] = explode( ',', trim( $temp[0] ) );
-				} else {
-					$oldRestrictions[$temp[0]] = explode( ',', trim( $temp[1] ) );
+					$oldRestrictions["edit"] = trim( $temp[0] );
+					$oldRestrictions["move"] = trim( $temp[0] );
+				} else if( $temp[1] ) {
+					$oldRestrictions[$temp[0]] = trim( $temp[1] );
 				}
 			}
+			# Clear invalid columns
+			if( $row->page_namespace == NS_MEDIAWIKI ) {
+				$db->update( 'page', array( 'page_restrictions' => '' ),
+					array( 'page_id' => $row->page_id ), __FUNCTION__ );
+				echo "...removed dead page_restrictions column for page {$row->page_id}\n";
+			}
 			# Update restrictions table
 			foreach( $oldRestrictions as $action => $restrictions ) {
 				$batch[] = array( 
@@ -56,12 +71,22 @@ function migrate_page_restrictions( $db ) {
 		# We use insert() and not replace() as Article.php replaces
 		# page_restrictions with '' when protected in the restrictions table
 		if ( count( $batch ) ) {
-			$db->insert( 'page_restrictions', $batch, __FUNCTION__ );
+			$ok = $db->deadlockLoop( array( $db, 'insert' ), 'page_restrictions', 
+				$batch, __FUNCTION__, array( 'IGNORE' ) );
+			if( !$ok ) {
+				throw new MWException( "Deadlock loop failed wtf :(" );
+			}
 		}
-		$blockStart += BATCH_SIZE;
-		$blockEnd += BATCH_SIZE;
+		$blockStart += BATCH_SIZE - 1;
+		$blockEnd += BATCH_SIZE - 1;
 		wfWaitForSlaves( 5 );
 	}
+	echo "...removing dead rows from page_restrictions\n";
+	// Kill any broken rows from previous imports
+	$db->delete( 'page_restrictions', array( 'pr_level' => '' ) );
+	// Kill other invalid rows
+	$db->deleteJoin( 'page_restrictions', 'page', 'pr_page', 'page_id', array('page_namespace' => NS_MEDIAWIKI) );
+	echo "...Done!\n";
 }
 
-?>
+