Change from global to parameter.

[lhc/web/wiklou.git] / maintenance / fixSlaveDesync.php

diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php
index 57999a5..c07ee0d 100644 (file)
--- a/maintenance/fixSlaveDesync.php
+++ b/maintenance/fixSlaveDesync.php
@@ -18,7 +18,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class FixSlaveDesync extends Maintenance {
        public function __construct() {
@@ -28,9 +28,7 @@ class FixSlaveDesync extends Maintenance {
        }
        
        public function execute() {
-               global $wgUseRootUser, $wgDBservers;
-               $wgUseRootUser = true;
-
+               global $slaveIndexes, $wgDBservers;
                $slaveIndexes = array();
                for ( $i = 1; $i < count( $wgDBservers ); $i++ ) {
                        if ( wfGetLB()->isNonZeroLoad( $i ) ) {
@@ -61,7 +59,7 @@ class FixSlaveDesync extends Maintenance {
                $masterIDs = array();
                $res = $dbw->select( 'page', array( 'page_id', 'page_latest' ), array( 'page_id<6054123' ), __METHOD__ );
                $this->output( "Number of pages: " . $dbw->numRows( $res ) . "\n" );
-               while ( $row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $masterIDs[$row->page_id] = $row->page_latest;
                        if ( !( ++$n % 10000 ) ) {
                                $this->output( "$n\r" );
@@ -74,7 +72,7 @@ class FixSlaveDesync extends Maintenance {
                foreach ( $slaveIndexes as $i ) {
                        $db = wfGetDB( $i );
                        $res = $db->select( 'page', array( 'page_id', 'page_latest' ), array( 'page_id<6054123' ), __METHOD__ );
-                       while ( $row = $db->fetchObject( $res ) ) {
+                       foreach ( $res as $row ) {
                                if ( isset( $masterIDs[$row->page_id] ) && $masterIDs[$row->page_id] != $row->page_latest ) {
                                        $desync[$row->page_id] = true;
                                        $this->output( $row->page_id . "\t" );
@@ -96,9 +94,9 @@ class FixSlaveDesync extends Maintenance {
                # Check for a corrupted page_latest
                $dbw = wfGetDB( DB_MASTER );
                $dbw->begin();
-               $realLatest = $dbw->selectField( 'page', 'page_latest', array( 'page_id' => $pageID ), 
+               $realLatest = $dbw->selectField( 'page', 'page_latest', array( 'page_id' => $pageID ),
                        __METHOD__, 'FOR UPDATE' );
-               #list( $masterFile, $masterPos ) = $dbw->getMasterPos();
+               # list( $masterFile, $masterPos ) = $dbw->getMasterPos();
                $found = false;
                foreach ( $slaveIndexes as $i ) {
                        $db = wfGetDB( $i );
@@ -108,7 +106,7 @@ class FixSlaveDesync extends Maintenance {
                                   $dbw->commit();
                                   sleep(10);
                                   return;
-                       }*/            
+                       }*/
                        $latest = $db->selectField( 'page', 'page_latest', array( 'page_id' => $pageID ), __METHOD__ );
                        $max = $db->selectField( 'revision', 'MAX(rev_id)', false, __METHOD__ );
                        if ( $latest != $realLatest && $realLatest < $max ) {
@@ -124,17 +122,17 @@ class FixSlaveDesync extends Maintenance {
                }
 
                # Find the missing revisions
-               $res = $dbw->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), 
+               $res = $dbw->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ),
                        __METHOD__, 'FOR UPDATE' );
                $masterIDs = array();
-               while ( $row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $masterIDs[] = $row->rev_id;
                }
                $dbw->freeResult( $res );
 
                $res = $db->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), __METHOD__ );
                $slaveIDs = array();
-               while ( $row = $db->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $slaveIDs[] = $row->rev_id;
                }
                $db->freeResult( $res );
@@ -166,7 +164,7 @@ class FixSlaveDesync extends Maintenance {
                                # Revision
                                $row = $dbFrom->selectRow( 'revision', '*', array( 'rev_id' => $rid ), __METHOD__ );
                                if ( $toMaster ) {
-                                       $id = $dbw->selectField( 'revision', 'rev_id', array( 'rev_id' => $rid ), 
+                                       $id = $dbw->selectField( 'revision', 'rev_id', array( 'rev_id' => $rid ),
                                                __METHOD__, 'FOR UPDATE' );
                                        if ( $id ) {
                                                $this->output( "Revision already exists\n" );
@@ -199,7 +197,7 @@ class FixSlaveDesync extends Maintenance {
                if ( $found ) {
                        $this->output( "Fixing page_latest... " );
                        if ( $toMaster ) {
-                               #$dbw->update( 'page', array( 'page_latest' => $realLatest ), array( 'page_id' => $pageID ), __METHOD__ );
+                               # $dbw->update( 'page', array( 'page_latest' => $realLatest ), array( 'page_id' => $pageID ), __METHOD__ );
                        } else {
                                foreach ( $slaveIndexes as $i ) {
                                        $db = wfGetDB( $i );