Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

maintenance: Batch delete for key conflicts in namespaceDupes.php

Browse source 
Limit the deletion of key conflicts for the links table to
$wgUpdateRowsPerQuery rows.

Also use IDatabase::factorConds to build the condiiton

Bug: T350443
Change-Id: I64ec5a01b457a395a1e830c28aabbc2dd3c0f539
This commit is contained in:
Umherirrender 2023-11-21 20:31:38 +01:00
parent 3f23b09748
commit baa4ceea55
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
maintenance/namespaceDupes.php
View file

@ -31,7 +31,6 @@ use MediaWiki\Linker\LinkTarget;
use MediaWiki\MainConfigNames;
use MediaWiki\Title\Title;
use MediaWiki\Title\TitleValue;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\IExpression;
use Wikimedia\Rdbms\IResultWrapper;
use Wikimedia\Rdbms\LikeValue;
@ -394,6 +393,7 @@ class NamespaceDupes extends Maintenance {
->orderBy( [ $titleField, $fromField ] )
->caller( __METHOD__ );
$updateRowsPerQuery = $this->getConfig()->get( MainConfigNames::UpdateRowsPerQuery );
while ( true ) {
$res = ( clone $sqb )
->andWhere( $batchConds )
@ -457,10 +457,7 @@ class NamespaceDupes extends Maintenance {
// When there is a key conflict on UPDATE IGNORE, delete the row
if ( !$dbw->affectedRows() ) {
$rowsToDelete[] = $dbw->makeList(
array_merge( [ $fromField => $row->$fromField ], $deleteCondition ),
IDatabase::LIST_AND
);
$rowsToDelete[] = array_merge( [ $fromField => $row->$fromField ], $deleteCondition );
}
$this->output( "$table $logTitle -> " .
@ -469,14 +466,22 @@ class NamespaceDupes extends Maintenance {
}
if ( $options['fix'] && count( $rowsToDelete ) > 0 ) {
$dbw->newDeleteQueryBuilder()
->deleteFrom( $table )
->where( $dbw->makeList( $rowsToDelete, IDatabase::LIST_OR ) )
->caller( __METHOD__ )
->execute();
$affectedRows = 0;
$deleteBatches = array_chunk( $rowsToDelete, $updateRowsPerQuery );
foreach ( $deleteBatches as $deleteBatch ) {
$dbw->newDeleteQueryBuilder()
->deleteFrom( $table )
->where( $dbw->factorConds( $deleteBatch ) )
->caller( __METHOD__ )
->execute();
$affectedRows += $dbw->affectedRows();
if ( count( $deleteBatches ) > 1 ) {
$this->waitForReplication();
}
}
$this->deletedLinks += $dbw->affectedRows();
$this->resolvableLinks -= $dbw->affectedRows();
$this->deletedLinks += $affectedRows;
$this->resolvableLinks -= $affectedRows;
}
$batchConds = [