wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-27 17:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

FixTrailingWhitespaceIds: Don't crash on complex conflicts

Browse source 
Also, move output and waiting to the outer loop.

Bug: T356196
Change-Id: Ibb88bfe3fb14e53eef4837ce9e681cebce399be1
(cherry picked from commit f4e419b019)
This commit is contained in:
Bartosz Dziewoński 2024-06-24 19:18:02 +02:00
parent 5b415eb241
commit fd87509978
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
maintenance/FixTrailingWhitespaceIds.php
View file

@ -3,6 +3,7 @@
namespace MediaWiki\Extension\DiscussionTools\Maintenance; namespace MediaWiki\Extension\DiscussionTools\Maintenance;
use LoggedUpdateMaintenance; use LoggedUpdateMaintenance;
use Wikimedia\Rdbms\DBQueryError;
use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\IExpression; use Wikimedia\Rdbms\IExpression;
use Wikimedia\Rdbms\LikeValue; use Wikimedia\Rdbms\LikeValue;
@ -73,6 +74,7 @@ class FixTrailingWhitespaceIds extends LoggedUpdateMaintenance {
if ( !$itemIds ) { if ( !$itemIds ) {
break; break;
} }
foreach ( $itemIds as $itemId ) { foreach ( $itemIds as $itemId ) {
$fixedItemId = preg_replace( $fixedItemId = preg_replace(
'/^([hc]\-.*)_(\-([0-9]{14}|[0-9-]{10}T[0-9:]{6}00.000Z))?$/', '/^([hc]\-.*)_(\-([0-9]{14}|[0-9-]{10}T[0-9:]{6}00.000Z))?$/',
@ -83,16 +85,26 @@ class FixTrailingWhitespaceIds extends LoggedUpdateMaintenance {
// In the rare case we got a false positive from the LIKE, add this to a list of skipped IDs // In the rare case we got a false positive from the LIKE, add this to a list of skipped IDs
// so we don't keep selecting it, and end up in an infinite loop // so we don't keep selecting it, and end up in an infinite loop
$skippedIds[] = $itemId; $skippedIds[] = $itemId;
continue;
} }
try {
$dbw->newUpdateQueryBuilder() $dbw->newUpdateQueryBuilder()
->update( 'discussiontools_item_ids' ) ->update( 'discussiontools_item_ids' )
->set( [ 'itid_itemid' => $fixedItemId ] ) ->set( [ 'itid_itemid' => $fixedItemId ] )
->where( [ 'itid_itemid' => $itemId ] ) ->where( [ 'itid_itemid' => $itemId ] )
->caller( __METHOD__ )->execute(); ->caller( __METHOD__ )->execute();
$this->waitForReplication(); } catch ( DBQueryError $err ) {
$total += $dbw->affectedRows(); // Give up on updating in case of complex conflicts (T356196#9913698)
$this->output( "$total\n" ); $this->output( "Failed to update $itemId\n" );
$skippedIds[] = $itemId;
continue;
} }
$total += $dbw->affectedRows();
}
$this->waitForReplication();
$this->output( "$total\n" );
} while ( true ); } while ( true );
$this->output( "Fixing DiscussionTools IDs with trailing whitespace: done.\n" ); $this->output( "Fixing DiscussionTools IDs with trailing whitespace: done.\n" );