$this->output( "Copying IP revisions to ip_changes, from rev_id $start to rev_id $end\n" );
while ( $blockStart <= $end ) {
- $blockEnd = min( $blockStart + 200, $end );
+ $blockEnd = min( $blockStart + $this->mBatchSize, $end );
$rows = $dbr->select(
'revision',
[ 'rev_id', 'rev_timestamp', 'rev_user_text' ],
[ "rev_id BETWEEN $blockStart AND $blockEnd", 'rev_user' => 0 ],
- __METHOD__,
- [ 'ORDER BY' => 'rev_id ASC', 'LIMIT' => $this->mBatchSize ]
+ __METHOD__
);
- if ( !$rows || $rows->numRows() === 0 ) {
+ $numRows = $rows->numRows();
+
+ if ( !$rows || $numRows === 0 ) {
break;
}
- $this->output( "...checking $this->mBatchSize revisions for IP edits that need copying, " .
+ $this->output( "...checking $numRows revisions for IP edits that need copying, " .
"between rev_ids $blockStart and $blockEnd\n" );
$insertRows = [];
foreach ( $rows as $row ) {
- // Double-check to make sure this is an IP, e.g. not maintenance user or imported revision.
+ // Make sure this is really an IP, e.g. not maintenance user or imported revision.
if ( IP::isValid( $row->rev_user_text ) ) {
$insertRows[] = [
'ipc_rev_id' => $row->rev_id,
$revCount++;
}
-
- $blockStart = (int)$row->rev_id;
}
- $blockStart++;
-
$dbw->insert(
'ip_changes',
$insertRows,
$lbFactory->waitForReplication();
usleep( $throttle * 1000 );
+
+ $blockStart = $blockEnd + 1;
}
$this->output( "$revCount IP revisions copied.\n" );