Merge "Rewrite pref cleanup script"

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

diff --git a/maintenance/populateRevisionSha1.php b/maintenance/populateRevisionSha1.php
index f96c2ec..54937ab 100644 (file)
--- a/maintenance/populateRevisionSha1.php
+++ b/maintenance/populateRevisionSha1.php
@@ -45,9 +45,9 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
                $db = $this->getDB( DB_MASTER );
 
                if ( !$db->tableExists( 'revision' ) ) {
-                       $this->error( "revision table does not exist", true );
+                       $this->fatalError( "revision table does not exist" );
                } elseif ( !$db->tableExists( 'archive' ) ) {
-                       $this->error( "archive table does not exist", true );
+                       $this->fatalError( "archive table does not exist" );
                } elseif ( !$db->fieldExists( 'revision', 'rev_sha1', __METHOD__ ) ) {
                        $this->output( "rev_sha1 column does not exist\n\n", true );
 
@@ -77,6 +77,7 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
         */
        protected function doSha1Updates( $table, $idCol, $queryInfo, $prefix ) {
                $db = $this->getDB( DB_MASTER );
+               $batchSize = $this->getBatchSize();
                $start = $db->selectField( $table, "MIN($idCol)", false, __METHOD__ );
                $end = $db->selectField( $table, "MAX($idCol)", false, __METHOD__ );
                if ( !$start || !$end ) {
@@ -87,13 +88,13 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
 
                $count = 0;
                # Do remaining chunk
-               $end += $this->mBatchSize - 1;
+               $end += $batchSize - 1;
                $blockStart = $start;
-               $blockEnd = $start + $this->mBatchSize - 1;
+               $blockEnd = $start + $batchSize - 1;
                while ( $blockEnd <= $end ) {
                        $this->output( "...doing $idCol from $blockStart to $blockEnd\n" );
-                       $cond = "$idCol BETWEEN $blockStart AND $blockEnd
-                               AND $idCol IS NOT NULL AND {$prefix}_sha1 = ''";
+                       $cond = "$idCol BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd .
+                               " AND $idCol IS NOT NULL AND {$prefix}_sha1 = ''";
                        $res = $db->select(
                                $queryInfo['tables'], $queryInfo['fields'], $cond, __METHOD__, [], $queryInfo['joins']
                        );
@@ -106,8 +107,8 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
                        }
                        $this->commitTransaction( $db, __METHOD__ );
 
-                       $blockStart += $this->mBatchSize;
-                       $blockEnd += $this->mBatchSize;
+                       $blockStart += $batchSize;
+                       $blockEnd += $batchSize;
                        wfWaitForSlaves();
                }
 
@@ -216,5 +217,5 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
        }
 }
 
-$maintClass = "PopulateRevisionSha1";
+$maintClass = PopulateRevisionSha1::class;
 require_once RUN_MAINTENANCE_IF_MAIN;