From 66a218c0860a1527ca230fc31fa1bab07dbef5a6 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Tue, 8 Apr 2008 06:30:33 +0000 Subject: [PATCH] Fixed progress output --- maintenance/archives/upgradeLogging.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/maintenance/archives/upgradeLogging.php b/maintenance/archives/upgradeLogging.php index 254a90c190..981ff8a90a 100644 --- a/maintenance/archives/upgradeLogging.php +++ b/maintenance/archives/upgradeLogging.php @@ -101,14 +101,20 @@ EOT; function sync( $srcTable, $dstTable ) { $batchSize = 1000; $minTs = $this->dbw->selectField( $srcTable, 'MIN(log_timestamp)', false, __METHOD__ ); + $minTsUnix = wfTimestamp( TS_UNIX, $minTs ); $numRowsCopied = 0; while ( true ) { $maxTs = $this->dbw->selectField( $srcTable, 'MAX(log_timestamp)', false, __METHOD__ ); $copyPos = $this->dbw->selectField( $dstTable, 'MAX(log_timestamp)', false, __METHOD__ ); + $maxTsUnix = wfTimestamp( TS_UNIX, $maxTs ); + $copyPosUnix = wfTimestamp( TS_UNIX, $copyPos ); - $percent = ( wfTimestamp( TS_UNIX, $maxTs ) - wfTimestamp( TS_UNIX, $minTs ) ) - / wfTimestamp( TS_UNIX, $copyPos ) * 100; + if ( $copyPos === null ) { + $percent = 0; + } else { + $percent = ( $copyPosUnix - $minTsUnix ) / ( $maxTsUnix - $minTsUnix ) * 100; + } printf( "%s %.2f%%\n", $copyPos, $percent ); # Handle all entries with timestamp equal to $copyPos -- 2.20.1