refreshLinks.php: Don't wait for slaves if nothing found in a chunk
authorKevin Israel <pleasestand@live.com>
Fri, 31 Jul 2015 23:03:31 +0000 (19:03 -0400)
committerKevin Israel <pleasestand@live.com>
Sun, 2 Aug 2015 10:46:44 +0000 (06:46 -0400)
Since 40e300b8273d, the last deletion batch is no longer handled
separately, so the wfWaitForSlaves() call added in 7492e90cc6b9
should no longer be necessary.

Also moved the remaining wfWaitForSlaves() call after the DELETE
query, as is the case in most other maintenance scripts.

Change-Id: I2c3c5ce20f81aed28b4b4c7ecf4eaaca7b9791d1

maintenance/refreshLinks.php

index f6c721f..763d97e 100644 (file)
@@ -344,17 +344,15 @@ class RefreshLinks extends Maintenance {
                                $numIds = count( $ids );
                                if ( $numIds ) {
                                        $counter += $numIds;
-                                       wfWaitForSlaves();
                                        $dbw->delete( $table, array( $field => $ids ), __METHOD__ );
                                        $this->output( ", $counter" );
                                        $tableStart = $ids[$numIds - 1] + 1;
+                                       wfWaitForSlaves();
                                }
 
                        } while ( $numIds >= $batchSize && ( $end === null || $tableStart <= $end ) );
 
                        $this->output( " deleted.\n" );
-
-                       wfWaitForSlaves();
                }
        }