MediaWiki 1.30.2

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

diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php
index 928cbf971298e86944d93bdac7074598d87f741c..e1179920ca495f922dced1ac5fee133a0f3049a8 100644 (file)
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -2,6 +2,21 @@
 /**
  * Move revision's text to external storage
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Maintenance ExternalStorage
  */
@@ -9,9 +24,9 @@
 define( 'REPORTING_INTERVAL', 1 );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
-       require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
-       require_once( dirname( __FILE__ ) . '/../../includes/ExternalStoreDB.php' );
-       require_once( 'resolveStubs.php' );
+       $optionsWithArgs = [ 'e', 's' ];
+       require_once __DIR__ . '/../commandLine.inc';
+       require_once 'resolveStubs.php';
 
        $fname = 'moveToExternal';
 
@@ -36,7 +51,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 function moveToExternal( $cluster, $maxID, $minID = 1 ) {
        $fname = 'moveToExternal';
        $dbw = wfGetDB( DB_MASTER );
-       $dbr = wfGetDB( DB_SLAVE );
+       $dbr = wfGetDB( DB_REPLICA );
 
        $count = $maxID - $minID + 1;
        $blockSize = 1000;
@@ -51,14 +66,14 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) {
 
                if ( !( $block % REPORTING_INTERVAL ) ) {
                        print "oldid=$blockStart, moved=$numMoved\n";
-                       wfWaitForSlaves( 2 );
+                       wfWaitForSlaves();
                }
 
-               $res = $dbr->select( 'text', array( 'old_id', 'old_flags', 'old_text' ),
-                       array(
+               $res = $dbr->select( 'text', [ 'old_id', 'old_flags', 'old_text' ],
+                       [
                                "old_id BETWEEN $blockStart AND $blockEnd",
                                'old_flags NOT ' . $dbr->buildLike( $dbr->anyString(), 'external', $dbr->anyString() ),
-                       ), $fname );
+                       ], $fname );
                foreach ( $res as $row ) {
                        # Resolve stubs
                        $text = $row->old_text;
@@ -103,11 +118,9 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) {
                                exit;
                        }
                        $dbw->update( 'text',
-                               array( 'old_flags' => $flags, 'old_text' => $url ),
-                               array( 'old_id' => $id ), $fname );
+                               [ 'old_flags' => $flags, 'old_text' => $url ],
+                               [ 'old_id' => $id ], $fname );
                        $numMoved++;
                }
        }
 }
-
-