MediaWiki 1.16.0

[autoinstallsdev/mediawiki.git] / maintenance / storage / resolveStubs.php

diff --git a/maintenance/storage/resolveStubs.php b/maintenance/storage/resolveStubs.php
index d22976c5f75d85b62d9ab478de318c69372d4955..346151e941c2f02a40caf52ae7a5235699619938 100644 (file)
--- a/maintenance/storage/resolveStubs.php
+++ b/maintenance/storage/resolveStubs.php
@@ -1,12 +1,15 @@
 <?php
+/**
+ * @file
+ * @ingroup Maintenance ExternalStorage
+ */
 
 define( 'REPORTING_INTERVAL', 100 );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
        $optionsWithArgs = array( 'm' );
 
-       require_once( '../commandLine.inc' );
-       require_once( 'includes/ExternalStoreDB.php' );
+       require_once( dirname(__FILE__) . '/../commandLine.inc' );
 
        resolveStubs();
 }
@@ -18,45 +21,31 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 function resolveStubs() {
        $fname = 'resolveStubs';
 
-       print "Retrieving stub rows...\n";
-       $dbr =& wfGetDB( DB_SLAVE );
+       $dbr = wfGetDB( DB_SLAVE );
        $maxID = $dbr->selectField( 'text', 'MAX(old_id)', false, $fname );
-       $stubs = array();
-       $flagsArray = array();
-
-       # Do it in 100 blocks
-       for ( $b = 0; $b < 100; $b++ ) {
-               print "$b%\r";
-               $start = intval($maxID / 100) * $b + 1;
-               $end = intval($maxID / 100) * ($b + 1);
-
+       $blockSize = 10000;
+       $numBlocks = intval( $maxID / $blockSize ) + 1;
+
+       for ( $b = 0; $b < $numBlocks; $b++ ) {
+               wfWaitForSlaves( 2 );
+               
+               printf( "%5.2f%%\n", $b / $numBlocks * 100 );
+               $start = intval($maxID / $numBlocks) * $b + 1;
+               $end = intval($maxID / $numBlocks) * ($b + 1);
+               
                $res = $dbr->select( 'text', array( 'old_id', 'old_text', 'old_flags' ),
-                       "old_id>=$start AND old_id<=$end AND old_flags like '%object%' ".
-                       "AND old_text LIKE 'O:15:\"historyblobstub\"%'", $fname );
+                       "old_id>=$start AND old_id<=$end " .
+                       "AND old_flags LIKE '%object%' AND old_flags NOT LIKE '%external%' ".
+                       'AND LOWER(CONVERT(LEFT(old_text,22) USING latin1)) = \'o:15:"historyblobstub"\'', 
+                       $fname );
                while ( $row = $dbr->fetchObject( $res ) ) {
-                       $stubs[$row->old_id] = $row->old_text;
-                       $flagsArray[$row->old_id] = $row->old_flags;
+                       resolveStub( $row->old_id, $row->old_text, $row->old_flags );
                }
                $dbr->freeResult( $res );
-       }
-       print "100%\n";
-
-       print "\nConverting " . count( $stubs ) . " rows ...\n";
 
-       # Get master database, no transactions
-       $dbw =& wfGetDB( DB_MASTER );
-       $dbw->clearFlag( DBO_TRX );
-       $dbw->immediateCommit();
-
-       $i = 0;
-       foreach( $stubs as $id => $stub ) {
-               if ( !(++$i % REPORTING_INTERVAL) ) {
-                       print "$i\n";
-                       wfWaitForSlaves( 5 );
-               }
-
-               resolveStub( $id, $stub, $flagsArray[$id] );
+               
        }
+       print "100%\n";
 }
 
 /**
@@ -68,23 +57,23 @@ function resolveStub( $id, $stubText, $flags ) {
        $stub = unserialize( $stubText );
        $flags = explode( ',', $flags );
 
-       $dbr =& wfGetDB( DB_SLAVE );
-       $dbw =& wfGetDB( DB_MASTER );
-       
-       if ( get_class( $stub ) !== 'historyblobstub' ) {
-               print "Error, invalid stub object\n";
+       $dbr = wfGetDB( DB_SLAVE );
+       $dbw = wfGetDB( DB_MASTER );
+
+       if ( strtolower( get_class( $stub ) ) !== 'historyblobstub' ) {
+               print "Error found object of class " . get_class( $stub ) . ", expecting historyblobstub\n";
                return;
        }
 
        # Get the (maybe) external row
-       $externalRow = $dbr->selectRow( 'text', array( 'old_text' ), 
-               array( 'old_id' => $stub->mOldId, "old_flags LIKE '%external%'" ),
-               $fname 
+       $externalRow = $dbr->selectRow( 'text', array( 'old_text' ),
+               array( 'old_id' => $stub->mOldId, 'old_flags' . $dbr->buildLike( $dbr->anyString(), 'external', $dbr->anyString() ) ),
+               $fname
        );
 
        if ( !$externalRow ) {
                # Object wasn't external
-               continue;
+               return;
        }
 
        # Preserve the legacy encoding flag, but switch from object to external
@@ -95,14 +84,15 @@ function resolveStub( $id, $stubText, $flags ) {
        }
 
        # Update the row
+       #print "oldid=$id\n";
        $dbw->update( 'text',
                array( /* SET */
-                       'old_flags' => $newFlags, 
+                       'old_flags' => $newFlags,
                        'old_text' => $externalRow->old_text . '/' . $stub->mHash
-               ), 
-               array( /* WHERE */ 
-                       'old_id' => $id 
-               ), $fname 
+               ),
+               array( /* WHERE */
+                       'old_id' => $id
+               ), $fname
        );
 }
-?>
+