Add @covers tags to user tests

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

diff --git a/maintenance/populateRevisionLength.php b/maintenance/populateRevisionLength.php
index a9457c2..cc1a9f1 100644 (file)
--- a/maintenance/populateRevisionLength.php
+++ b/maintenance/populateRevisionLength.php
@@ -44,9 +44,9 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance {
        public function doDBUpdates() {
                $dbw = $this->getDB( DB_MASTER );
                if ( !$dbw->tableExists( 'revision' ) ) {
-                       $this->error( "revision table does not exist", true );
+                       $this->fatalError( "revision table does not exist" );
                } elseif ( !$dbw->tableExists( 'archive' ) ) {
-                       $this->error( "archive table does not exist", true );
+                       $this->fatalError( "archive table does not exist" );
                } elseif ( !$dbw->fieldExists( 'revision', 'rev_len', __METHOD__ ) ) {
                        $this->output( "rev_len column does not exist\n\n", true );
 
@@ -54,10 +54,10 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance {
                }
 
                $this->output( "Populating rev_len column\n" );
-               $rev = $this->doLenUpdates( 'revision', 'rev_id', 'rev', Revision::selectFields() );
+               $rev = $this->doLenUpdates( 'revision', 'rev_id', 'rev', Revision::getQueryInfo() );
 
                $this->output( "Populating ar_len column\n" );
-               $ar = $this->doLenUpdates( 'archive', 'ar_id', 'ar', Revision::selectArchiveFields() );
+               $ar = $this->doLenUpdates( 'archive', 'ar_id', 'ar', Revision::getArchiveQueryInfo() );
 
                $this->output( "rev_len and ar_len population complete "
                        . "[$rev revision rows, $ar archive rows].\n" );
@@ -69,12 +69,13 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance {
         * @param string $table
         * @param string $idCol
         * @param string $prefix
-        * @param array $fields
+        * @param array $queryInfo
         * @return int
         */
-       protected function doLenUpdates( $table, $idCol, $prefix, $fields ) {
+       protected function doLenUpdates( $table, $idCol, $prefix, $queryInfo ) {
                $dbr = $this->getDB( DB_REPLICA );
                $dbw = $this->getDB( DB_MASTER );
+               $batchSize = $this->getBatchSize();
                $start = $dbw->selectField( $table, "MIN($idCol)", false, __METHOD__ );
                $end = $dbw->selectField( $table, "MAX($idCol)", false, __METHOD__ );
                if ( !$start || !$end ) {
@@ -85,20 +86,22 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance {
 
                # Do remaining chunks
                $blockStart = intval( $start );
-               $blockEnd = intval( $start ) + $this->mBatchSize - 1;
+               $blockEnd = intval( $start ) + $batchSize - 1;
                $count = 0;
 
                while ( $blockStart <= $end ) {
                        $this->output( "...doing $idCol from $blockStart to $blockEnd\n" );
                        $res = $dbr->select(
-                               $table,
-                               $fields,
+                               $queryInfo['tables'],
+                               $queryInfo['fields'],
                                [
                                        "$idCol >= $blockStart",
                                        "$idCol <= $blockEnd",
                                        "{$prefix}_len IS NULL"
                                ],
-                               __METHOD__
+                               __METHOD__,
+                               [],
+                               $queryInfo['joins']
                        );
 
                        if ( $res->numRows() > 0 ) {
@@ -112,8 +115,8 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance {
                                $this->commitTransaction( $dbw, __METHOD__ );
                        }
 
-                       $blockStart += $this->mBatchSize;
-                       $blockEnd += $this->mBatchSize;
+                       $blockStart += $batchSize;
+                       $blockEnd += $batchSize;
                        wfWaitForSlaves();
                }