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

Merge "maintenance: Reduce delete attempts in namespaceDupes.php"

Browse source
This commit is contained in:
jenkins-bot 2023-11-20 02:38:46 +00:00 committed by Gerrit Code Review
commit ca9f8418d9
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
maintenance/namespaceDupes.php
View file

@ -402,7 +402,7 @@ class NamespaceDupes extends Maintenance {
break;
}
$rowsToDeleteIfStillExists = [];
$rowsToDelete = [];
foreach ( $res as $row ) {
$logTitle = "from={$row->$fromField} ns={$row->$namespaceField} " .
@ -455,20 +455,23 @@ class NamespaceDupes extends Maintenance {
->caller( __METHOD__ )
->execute();
$rowsToDeleteIfStillExists[] = $dbw->makeList(
array_merge( [ $fromField => $row->$fromField ], $deleteCondition ),
IDatabase::LIST_AND
);
// 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
);
}
$this->output( "$table $logTitle -> " .
$destTitle->getPrefixedDBkey() . "\n"
);
}
if ( $options['fix'] && count( $rowsToDeleteIfStillExists ) > 0 ) {
if ( $options['fix'] && count( $rowsToDelete ) > 0 ) {
$dbw->newDeleteQueryBuilder()
->deleteFrom( $table )
->where( $dbw->makeList( $rowsToDeleteIfStillExists, IDatabase::LIST_OR ) )
->where( $dbw->makeList( $rowsToDelete, IDatabase::LIST_OR ) )
->caller( __METHOD__ )
->execute();