Merge "Fix FileBackendGroup test for some configurations"

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

diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php
index fa9c574..02152f7 100644 (file)
--- a/maintenance/convertLinks.php
+++ b/maintenance/convertLinks.php
@@ -21,6 +21,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/Maintenance.php';
 
 /**
@@ -75,8 +77,6 @@ class ConvertLinks extends Maintenance {
                        return;
                }
 
-               global $wgContLang;
-
                # counters etc
                $numBadLinks = $curRowsRead = 0;
 
@@ -126,7 +126,6 @@ class ConvertLinks extends Maintenance {
                $res = $dbw->query( "SELECT COUNT(*) AS count FROM $links" );
                $row = $dbw->fetchObject( $res );
                $numRows = $row->count;
-               $dbw->freeResult( $res );
 
                if ( $numRows == 0 ) {
                        $this->output( "Updating schema (no rows to convert)...\n" );
@@ -145,30 +144,34 @@ class ConvertLinks extends Maintenance {
                        $this->output( "Loading IDs from $cur table...\n" );
                        $this->performanceLog( $fh, "Reading $numRows rows from cur table...\n" );
                        $this->performanceLog( $fh, "rows read vs seconds elapsed:\n" );
-
-                       $dbw->bufferResults( false );
-                       $res = $dbw->query( "SELECT cur_namespace,cur_title,cur_id FROM $cur" );
-                       $ids = array();
-
-                       foreach ( $res as $row ) {
-                               $title = $row->cur_title;
-                               if ( $row->cur_namespace ) {
-                                       $title = $wgContLang->getNsText( $row->cur_namespace ) . ":$title";
-                               }
-                               $ids[$title] = $row->cur_id;
-                               $curRowsRead++;
-                               if ( $reportCurReadProgress ) {
-                                       if ( ( $curRowsRead % $curReadReportInterval ) == 0 ) {
-                                               $this->performanceLog(
-                                                       $fh,
-                                                       $curRowsRead . " " . ( microtime( true ) - $baseTime ) . "\n"
-                                               );
-                                               $this->output( "\t$curRowsRead rows of $cur table read.\n" );
+                       $contentLang = MediaWikiServices::getInstance()->getContentLanguage();
+
+                       $ids = [];
+                       $lastId = 0;
+                       do {
+                               $res = $dbw->query(
+                                       "SELECT cur_namespace,cur_title,cur_id FROM $cur " .
+                                       "WHERE cur_id > $lastId ORDER BY cur_id LIMIT 10000"
+                               );
+                               foreach ( $res as $row ) {
+                                       $title = $row->cur_title;
+                                       if ( $row->cur_namespace ) {
+                                               $title = $contentLang->getNsText( $row->cur_namespace ) . ":$title";
                                        }
+                                       $ids[$title] = $row->cur_id;
+                                       $curRowsRead++;
+                                       if ( $reportCurReadProgress ) {
+                                               if ( ( $curRowsRead % $curReadReportInterval ) == 0 ) {
+                                                       $this->performanceLog(
+                                                               $fh,
+                                                               $curRowsRead . " " . ( microtime( true ) - $baseTime ) . "\n"
+                                                       );
+                                                       $this->output( "\t$curRowsRead rows of $cur table read.\n" );
+                                               }
+                                       }
+                                       $lastId = $row->cur_id;
                                }
-                       }
-                       $dbw->freeResult( $res );
-                       $dbw->bufferResults( true );
+                       } while ( $res->numRows() > 0 );
                        $this->output( "Finished loading IDs.\n\n" );
                        $this->performanceLog(
                                $fh,
@@ -193,9 +196,9 @@ class ConvertLinks extends Maintenance {
                                $sqlRead = $dbw->limitResult( $sqlRead, $linksConvInsertInterval, $rowOffset );
                                $res = $dbw->query( $sqlRead );
                                if ( $noKeys ) {
-                                       $sqlWrite = array( "INSERT INTO $links_temp (l_from,l_to) VALUES " );
+                                       $sqlWrite = [ "INSERT INTO $links_temp (l_from,l_to) VALUES " ];
                                } else {
-                                       $sqlWrite = array( "INSERT IGNORE INTO $links_temp (l_from,l_to) VALUES " );
+                                       $sqlWrite = [ "INSERT IGNORE INTO $links_temp (l_from,l_to) VALUES " ];
                                }
 
                                $tuplesAdded = 0; # no tuples added to INSERT yet
@@ -213,7 +216,6 @@ class ConvertLinks extends Maintenance {
                                                $numBadLinks++;
                                        }
                                }
-                               $dbw->freeResult( $res );
                                # $this->output( "rowOffset: $rowOffset\ttuplesAdded: "
                                #       . "$tuplesAdded\tnumBadLinks: $numBadLinks\n" );
                                if ( $tuplesAdded != 0 ) {
@@ -302,5 +304,5 @@ class ConvertLinks extends Maintenance {
        }
 }
 
-$maintClass = "ConvertLinks";
+$maintClass = ConvertLinks::class;
 require_once RUN_MAINTENANCE_IF_MAIN;