From 1976b1a6fd07f58f30ebc6d32f0592efca9cbc17 Mon Sep 17 00:00:00 2001 From: Kevin Israel Date: Sat, 28 Feb 2015 04:54:48 -0500 Subject: [PATCH] refreshLinks.php: Tweak exit condition in deleteLinksFromNonexistent() Instead of exiting the do...while loop only once a query returns zero rows, exit whenever fewer rows than the batch size are returned. This could save quite a bit of time when the highest nonexistent page_id found is a relatively low one. Follows-up 40e300b8273d. Bug: T44180 Change-Id: I14d2d48c2405fcc0bd05a3181ba6293caef5298c --- maintenance/refreshLinks.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php index 7c85a1ccf9..b2f7497469 100644 --- a/maintenance/refreshLinks.php +++ b/maintenance/refreshLinks.php @@ -284,7 +284,7 @@ class RefreshLinks extends Maintenance { $this->output( "0.." ); do { - $list = $dbr->selectFieldValues( + $ids = $dbr->selectFieldValues( $table, $field, array( @@ -295,15 +295,16 @@ class RefreshLinks extends Maintenance { array( 'DISTINCT', 'ORDER BY' => $field, 'LIMIT' => $batchSize ) ); - if ( $list ) { - $counter += count( $list ); + $numIds = count( $ids ); + if ( $numIds ) { + $counter += $numIds; wfWaitForSlaves(); - $dbw->delete( $table, array( $field => $list ), __METHOD__ ); + $dbw->delete( $table, array( $field => $ids ), __METHOD__ ); $this->output( $counter . ".." ); - $start = $list[count( $list ) - 1] + 1; + $start = $ids[$numIds - 1] + 1; } - } while ( $list ); + } while ( $numIds >= $batchSize ); $this->output( "\n" ); wfWaitForSlaves(); -- 2.20.1