MediaWiki 1.14.0

[autoinstallsdev/mediawiki.git] / maintenance / updateRestrictions.php

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index 9503d0b7872232c42f9e77aee8297410ef09b842..f0567b5b8f1d8239af07e02115f412eb325b4683 100644 (file)
--- 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 );
@@ -23,22 +25,31 @@ function migrate_page_restrictions( $db ) {
        
        $start = $db->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
        $end = $db->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+       
+       if( !$start ) {
+               die("Nothing to do.\n");
+       }
+       
+       # Do remaining chunk
+       $end += BATCH_SIZE - 1;
        $blockStart = $start;
        $blockEnd = $start + BATCH_SIZE - 1;
        $encodedExpiry = 'infinity';
        while ( $blockEnd <= $end ) {
-               $cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !='' AND page_restrictions !='edit=:move='";
+               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_restrictions'), $cond, __FUNCTION__ );
                $batch = array();
                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"] = trim( $temp[0] );
                                        $oldRestrictions["move"] = trim( $temp[0] );
-                               } else {
+                               } else if( $temp[1] ) {
                                        $oldRestrictions[$temp[0]] = trim( $temp[1] );
                                }
                        }
@@ -56,12 +67,21 @@ 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' => '' ) );
+       echo "...Done!\n";
 }