Revert "merged master"

[lhc/web/wiklou.git] / maintenance / storage / moveToExternal.php

diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php
index ec1c4c6..64f3ada 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,10 +24,8 @@
 define( 'REPORTING_INTERVAL', 1 );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
-       $optionsWithArgs = array( 'e', 's' );
-
        require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
-       require_once( 'ExternalStoreDB.php' );
+       require_once( dirname( __FILE__ ) . '/../../includes/ExternalStoreDB.php' );
        require_once( 'resolveStubs.php' );
 
        $fname = 'moveToExternal';
@@ -35,8 +48,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
        moveToExternal( $cluster, $maxID, $minID );
 }
 
-
-
 function moveToExternal( $cluster, $maxID, $minID = 1 ) {
        $fname = 'moveToExternal';
        $dbw = wfGetDB( DB_MASTER );
@@ -52,18 +63,18 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) {
        for ( $block = 0; $block < $numBlocks; $block++ ) {
                $blockStart = $block * $blockSize + $minID;
                $blockEnd = $blockStart + $blockSize - 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(
                                "old_id BETWEEN $blockStart AND $blockEnd",
                                'old_flags NOT ' . $dbr->buildLike( $dbr->anyString(), 'external', $dbr->anyString() ),
                        ), $fname );
-               while ( $row = $dbr->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        # Resolve stubs
                        $text = $row->old_text;
                        $id = $row->old_id;
@@ -72,7 +83,7 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) {
                        } else {
                                $flags = "{$row->old_flags},external";
                        }
-                       
+
                        if ( strpos( $flags, 'object' ) !== false ) {
                                $obj = unserialize( $text );
                                $className = strtolower( get_class( $obj ) );