add usage for --no-extensions

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

diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php
index 02eb623..0f13645 100644 (file)
--- a/maintenance/initEditCount.php
+++ b/maintenance/initEditCount.php
@@ -1,5 +1,8 @@
 <?php
 /**
 <?php
 /**

+ * Init the user_editcount database field based on the number of rows in the
+ * revision table.
+ *

  * 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
  * 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


@@ -15,6 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *

+ * @file

  * @ingroup Maintenance
  */
 
  * @ingroup Maintenance
  */
 


@@ -30,12 +34,11 @@ class InitEditCount extends Maintenance {
 
 Background mode will be automatically used if the server is MySQL 4.0
 (which does not support subqueries) or if multiple servers are listed
 
 Background mode will be automatically used if the server is MySQL 4.0
 (which does not support subqueries) or if multiple servers are listed

-in $wgDBservers, usually indicating a replication environment.' );
+in the load balancer, usually indicating a replication environment.' );

                $this->mDescription = "Batch-recalculate user_editcount fields from the revision table";
        }
 
        public function execute() {
                $this->mDescription = "Batch-recalculate user_editcount fields from the revision table";
        }
 
        public function execute() {

-               global $wgDBservers;

                $dbw = wfGetDB( DB_MASTER );
                $user = $dbw->tableName( 'user' );
                $revision = $dbw->tableName( 'revision' );
                $dbw = wfGetDB( DB_MASTER );
                $user = $dbw->tableName( 'user' );
                $revision = $dbw->tableName( 'revision' );


@@ -43,9 +46,9 @@ in $wgDBservers, usually indicating a replication environment.' );
                $dbver = $dbw->getServerVersion();
 
                // Autodetect mode...
                $dbver = $dbw->getServerVersion();
 
                // Autodetect mode...

-               $backgroundMode = count( $wgDBservers ) > 1 ||
+               $backgroundMode = wfGetLB()->getServerCount() > 1 ||

                        ( $dbw instanceof DatabaseMysql && version_compare( $dbver, '4.1' ) < 0 );
                        ( $dbw instanceof DatabaseMysql && version_compare( $dbver, '4.1' ) < 0 );

-       
+

                if ( $this->hasOption( 'background' ) ) {
                        $backgroundMode = true;
                } elseif ( $this->hasOption( 'quick' ) ) {
                if ( $this->hasOption( 'background' ) ) {
                        $backgroundMode = true;
                } elseif ( $this->hasOption( 'quick' ) ) {


@@ -80,7 +83,6 @@ in $wgDBservers, usually indicating a replication environment.' );
                                                __METHOD__ );
                                        ++$migrated;
                                }
                                                __METHOD__ );
                                        ++$migrated;
                                }

-                               $dbr->freeResult( $result );

 
                                $delta = microtime( true ) - $start;
                                $rate = ( $delta == 0.0 ) ? 0.0 : $migrated / $delta;
 
                                $delta = microtime( true ) - $start;
                                $rate = ( $delta == 0.0 ) ? 0.0 : $migrated / $delta;


@@ -91,7 +93,7 @@ in $wgDBservers, usually indicating a replication environment.' );
                                        $delta,
                                        $rate ) );
 
                                        $delta,
                                        $rate ) );
 

-                               wfWaitForSlaves( 10 );
+                               wfWaitForSlaves();

                        }
                } else {
                        // Subselect should work on modern MySQLs etc
                        }
                } else {
                        // Subselect should work on modern MySQLs etc


@@ -105,4 +107,4 @@ in $wgDBservers, usually indicating a replication environment.' );
 }
 
 $maintClass = "InitEditCount";
 }
 
 $maintClass = "InitEditCount";

-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );