From c47f83a4d42f43be0f12e0a8d085ff6b535643e5 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 24 Feb 2012 18:45:24 +0000 Subject: [PATCH] More __METHOD__ in our madness --- docs/database.txt | 4 ++-- includes/UserMailer.php | 4 ++-- includes/db/DatabaseIbm_db2.php | 8 ++++---- includes/db/DatabasePostgres.php | 6 +++--- includes/filerepo/file/LocalFile.php | 16 ++++++++-------- includes/filerepo/file/OldLocalFile.php | 6 +++--- includes/installer/MysqlInstaller.php | 10 +++++----- includes/installer/PostgresInstaller.php | 4 ++-- includes/job/JobQueue.php | 22 +++++++++++----------- maintenance/Maintenance.php | 4 ++-- maintenance/cleanupImages.php | 6 +++--- maintenance/cleanupSpam.php | 4 ++-- maintenance/deleteArchivedFiles.inc | 4 ++-- maintenance/deleteArchivedRevisions.inc | 4 ++-- maintenance/deleteBatch.php | 4 ++-- maintenance/deleteDefaultMessages.php | 4 ++-- maintenance/deleteOldRevisions.php | 4 ++-- maintenance/deleteOrphanedRevisions.php | 4 ++-- maintenance/fixSlaveDesync.php | 6 +++--- maintenance/migrateUserGroup.php | 4 ++-- maintenance/nukeNS.php | 6 +++--- maintenance/nukePage.php | 8 ++++---- maintenance/populateLogUsertext.php | 4 ++-- maintenance/populateRevisionSha1.php | 12 ++++++------ maintenance/purgeOldText.inc | 4 ++-- maintenance/reassignEdits.php | 4 ++-- maintenance/rebuildFileCache.php | 4 ++-- maintenance/refreshLinks.php | 4 ++-- maintenance/removeUnusedAccounts.php | 4 ++-- maintenance/storage/fixBug20757.php | 4 ++-- maintenance/storage/recompressTracked.php | 12 ++++++------ maintenance/updateCollation.php | 4 ++-- 32 files changed, 99 insertions(+), 99 deletions(-) diff --git a/docs/database.txt b/docs/database.txt index 3985b70e07..70815d48b2 100644 --- a/docs/database.txt +++ b/docs/database.txt @@ -153,9 +153,9 @@ enclose small groups of queries in their own transaction. Use the following syntax: $dbw = wfGetDB( DB_MASTER ); -$dbw->begin(); +$dbw->begin( __METHOD__ ); /* Do queries */ -$dbw->commit(); +$dbw->commit( __METHOD__ ); Use of locking reads (e.g. the FOR UPDATE clause) is not advised. They are poorly implemented in InnoDB and will cause regular deadlock errors. diff --git a/includes/UserMailer.php b/includes/UserMailer.php index a2a062622d..74b105b5db 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -448,7 +448,7 @@ class EmailNotification { if ( $watchers ) { // Update wl_notificationtimestamp for all watching users except // the editor - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dbw->update( 'watchlist', array( /* SET */ 'wl_notificationtimestamp' => $dbw->timestamp( $timestamp ) @@ -458,7 +458,7 @@ class EmailNotification { 'wl_user' => $watchers ), __METHOD__ ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); } } diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php index e524752ce8..790a177fcb 100644 --- a/includes/db/DatabaseIbm_db2.php +++ b/includes/db/DatabaseIbm_db2.php @@ -791,9 +791,9 @@ class DatabaseIbm_db2 extends DatabaseBase { protected function applySchema() { if ( !( $this->mSchemaSet ) ) { $this->mSchemaSet = true; - $this->begin(); + $this->begin( __METHOD__ ); $this->doQuery( "SET SCHEMA = $this->mSchema" ); - $this->commit(); + $this->commit( __METHOD__ ); } } @@ -1016,7 +1016,7 @@ class DatabaseIbm_db2 extends DatabaseBase { $res = true; // If we are not in a transaction, we need to be for savepoint trickery if ( !$this->mTrxLevel ) { - $this->begin(); + $this->begin( __METHOD__ ); } $sql = "INSERT INTO $table ( " . implode( ',', $keys ) . ' ) VALUES '; @@ -1031,7 +1031,7 @@ class DatabaseIbm_db2 extends DatabaseBase { $stmt = $this->prepare( $sql ); // start a transaction/enter transaction mode - $this->begin(); + $this->begin( __METHOD__ ); if ( !$ignore ) { //$first = true; diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index 71a84b4406..6a453e72a4 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -540,7 +540,7 @@ class DatabasePostgres extends DatabaseBase { if ( $ignore ) { $olde = error_reporting( $olde ); if ( $didbegin ) { - $this->commit(); + $this->commit( __METHOD__ ); } // Set the affected row count for the whole operation @@ -587,7 +587,7 @@ class DatabasePostgres extends DatabaseBase { $didbegin = 0; if ( $ignore ) { if( !$this->mTrxLevel ) { - $this->begin(); + $this->begin( __METHOD__ ); $didbegin = 1; } $olde = error_reporting( 0 ); @@ -616,7 +616,7 @@ class DatabasePostgres extends DatabaseBase { } $olde = error_reporting( $olde ); if( $didbegin ) { - $this->commit(); + $this->commit( __METHOD__ ); } // Set the affected row count for the whole operation diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 0a85fffcc9..70849503df 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -959,7 +959,7 @@ class LocalFile extends File { } $dbw = $this->repo->getMasterDB(); - $dbw->begin(); + $dbw->begin( __METHOD__ ); if ( !$props ) { $props = $this->repo->getFileProps( $this->getVirtualUrl() ); @@ -1111,7 +1111,7 @@ class LocalFile extends File { # Commit the transaction now, in case something goes wrong later # The most important thing is that files don't get lost, especially archives - $dbw->commit(); + $dbw->commit( __METHOD__ ); # Save to cache and purge the squid # We shall not saveToCache before the commit since otherwise @@ -1409,7 +1409,7 @@ class LocalFile extends File { $dbw = $this->repo->getMasterDB(); if ( !$this->locked ) { - $dbw->begin(); + $dbw->begin( __METHOD__ ); $this->locked++; } @@ -1425,7 +1425,7 @@ class LocalFile extends File { --$this->locked; if ( !$this->locked ) { $dbw = $this->repo->getMasterDB(); - $dbw->commit(); + $dbw->commit( __METHOD__ ); } } } @@ -1436,7 +1436,7 @@ class LocalFile extends File { function unlockAndRollback() { $this->locked = false; $dbw = $this->repo->getMasterDB(); - $dbw->rollback(); + $dbw->rollback( __METHOD__ ); } } // LocalFile class @@ -2215,17 +2215,17 @@ class LocalFileMoveBatch { return $statusMove; } - $this->db->begin(); + $this->db->begin( __METHOD__ ); $statusDb = $this->doDBUpdates(); wfDebugLog( 'imagemove', "Renamed {$this->file->getName()} in database: {$statusDb->successCount} successes, {$statusDb->failCount} failures" ); if ( !$statusDb->isGood() ) { - $this->db->rollback(); + $this->db->rollback( __METHOD__ ); // Something went wrong with the DB updates, so remove the target files $this->cleanupTarget( $triplets ); $statusDb->ok = false; return $statusDb; } - $this->db->commit(); + $this->db->commit( __METHOD__ ); // Everything went ok, remove the source files $this->cleanupSource( $triplets ); diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php index 3256a75b95..cec70d6f37 100644 --- a/includes/filerepo/file/OldLocalFile.php +++ b/includes/filerepo/file/OldLocalFile.php @@ -260,7 +260,7 @@ class OldLocalFile extends LocalFile { */ function recordOldUpload( $srcPath, $archiveName, $timestamp, $comment, $user ) { $dbw = $this->repo->getMasterDB(); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dstPath = $this->repo->getZonePath( 'public' ) . '/' . $this->getRel(); $props = $this->repo->getFileProps( $dstPath ); @@ -288,9 +288,9 @@ class OldLocalFile extends LocalFile { ), __METHOD__ ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); return true; } - + } diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index 7585fe7a59..cd234cd1a5 100644 --- a/includes/installer/MysqlInstaller.php +++ b/includes/installer/MysqlInstaller.php @@ -514,9 +514,9 @@ class MysqlInstaller extends DatabaseInstaller { $fullName = $this->buildFullUserName( $dbUser, $host ); if( !$this->userDefinitelyExists( $dbUser, $host ) ) { try{ - $this->db->begin(); + $this->db->begin( __METHOD__ ); $this->db->query( "CREATE USER $fullName IDENTIFIED BY $escPass", __METHOD__ ); - $this->db->commit(); + $this->db->commit( __METHOD__ ); $grantableNames[] = $fullName; } catch( DBQueryError $dqe ) { if( $this->db->lastErrno() == 1396 /* ER_CANNOT_USER */ ) { @@ -544,11 +544,11 @@ class MysqlInstaller extends DatabaseInstaller { $dbAllTables = $this->db->addIdentifierQuotes( $dbName ) . '.*'; foreach( $grantableNames as $name ) { try { - $this->db->begin(); + $this->db->begin( __METHOD__ ); $this->db->query( "GRANT ALL PRIVILEGES ON $dbAllTables TO $name", __METHOD__ ); - $this->db->commit(); + $this->db->commit( __METHOD__ ); } catch( DBQueryError $dqe ) { - $this->db->rollback(); + $this->db->rollback( __METHOD__ ); $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->getText() ); } } diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php index fa5a62888f..544fe85177 100644 --- a/includes/installer/PostgresInstaller.php +++ b/includes/installer/PostgresInstaller.php @@ -147,7 +147,7 @@ class PostgresInstaller extends DatabaseInstaller { */ $conn = $status->value; $conn->clearFlag( DBO_TRX ); - $conn->commit(); + $conn->commit( __METHOD__ ); $this->pgConns[$type] = $conn; } return $status; @@ -478,7 +478,7 @@ class PostgresInstaller extends DatabaseInstaller { } function commitChanges() { - $this->db->commit(); + $this->db->commit( __METHOD__ ); return Status::newGood(); } diff --git a/includes/job/JobQueue.php b/includes/job/JobQueue.php index e7c66719fc..ac70dcbd76 100644 --- a/includes/job/JobQueue.php +++ b/includes/job/JobQueue.php @@ -56,7 +56,7 @@ abstract class Job { $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $row = $dbw->selectRow( 'job', @@ -67,7 +67,7 @@ abstract class Job { ); if ( $row === false ) { - $dbw->commit(); + $dbw->commit( __METHOD__ ); wfProfileOut( __METHOD__ ); return false; } @@ -75,7 +75,7 @@ abstract class Job { /* Ensure we "own" this row */ $dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ ); $affected = $dbw->affectedRows(); - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( $affected == 0 ) { wfProfileOut( __METHOD__ ); @@ -146,7 +146,7 @@ abstract class Job { $dbw = wfGetDB( DB_MASTER ); $dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ ); $affected = $dbw->affectedRows(); - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( !$affected ) { // Failed, someone else beat us to it @@ -170,7 +170,7 @@ abstract class Job { // Delete the random row $dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ ); $affected = $dbw->affectedRows(); - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( !$affected ) { // Random job gone before we exclusively deleted it @@ -260,16 +260,16 @@ abstract class Job { $rows[] = $job->insertFields(); if ( count( $rows ) >= 50 ) { # Do a small transaction to avoid slave lag - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dbw->insert( 'job', $rows, __METHOD__, 'IGNORE' ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); $rows = array(); } } if ( $rows ) { // last chunk - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dbw->insert( 'job', $rows, __METHOD__, 'IGNORE' ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); } wfIncrStats( 'job-insert', count( $jobs ) ); } @@ -369,10 +369,10 @@ abstract class Job { $fields = $this->insertFields(); unset( $fields['job_id'] ); $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dbw->delete( 'job', $fields, __METHOD__ ); $affected = $dbw->affectedRows(); - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( $affected ) { wfIncrStats( 'job-dup-delete', $affected ); } diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index d07763ec2c..fda12f9e7e 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -954,7 +954,7 @@ abstract class Maintenance { public function purgeRedundantText( $delete = true ) { # Data should come off the master, wrapped in a transaction $dbw = $this->getDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $tbl_arc = $dbw->tableName( 'archive' ); $tbl_rev = $dbw->tableName( 'revision' ); @@ -999,7 +999,7 @@ abstract class Maintenance { } # Done - $dbw->commit(); + $dbw->commit( __METHOD__ ); } /** diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php index 81d1c85bda..581ff2dd9c 100644 --- a/maintenance/cleanupImages.php +++ b/maintenance/cleanupImages.php @@ -156,7 +156,7 @@ class ImageCleanup extends TableCleanup { } else { $this->output( "renaming $path to $finalPath\n" ); // @todo FIXME: Should this use File::move()? - $db->begin(); + $db->begin( __METHOD__ ); $db->update( 'image', array( 'img_name' => $final ), array( 'img_name' => $orig ), @@ -178,10 +178,10 @@ class ImageCleanup extends TableCleanup { } } if ( rename( $path, $finalPath ) ) { - $db->commit(); + $db->commit( __METHOD__ ); } else { $this->error( "RENAME FAILED" ); - $db->rollback(); + $db->rollback( __METHOD__ ); } } } diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php index ca1e302bc3..8a760cdc04 100644 --- a/maintenance/cleanupSpam.php +++ b/maintenance/cleanupSpam.php @@ -106,7 +106,7 @@ class CleanupSpam extends Maintenance { $this->output( "False match\n" ); } else { $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $page = WikiPage::factory( $title ); if ( !$rev ) { // Didn't find a non-spammy revision, blank the page @@ -118,7 +118,7 @@ class CleanupSpam extends Maintenance { $page->doEdit( $rev->getText(), wfMsgForContent( 'spam_reverting', $domain ), EDIT_UPDATE, $rev->getId() ); } - $dbw->commit(); + $dbw->commit( __METHOD__ ); } } } diff --git a/maintenance/deleteArchivedFiles.inc b/maintenance/deleteArchivedFiles.inc index 68394b4aad..2eacb73b9e 100644 --- a/maintenance/deleteArchivedFiles.inc +++ b/maintenance/deleteArchivedFiles.inc @@ -24,7 +24,7 @@ class DeleteArchivedFilesImplementation { static public function doDelete( $output, $force ) { # Data should come off the master, wrapped in a transaction $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $tbl_arch = $dbw->tableName( 'filearchive' ); $repo = RepoGroup::singleton()->getLocalRepo(); # Get "active" revisions from the filearchive table @@ -59,7 +59,7 @@ class DeleteArchivedFilesImplementation { } } } - $dbw->commit(); + $dbw->commit( __METHOD__ ); $output->handleOutput( "Done! [$count file(s)]\n" ); } } \ No newline at end of file diff --git a/maintenance/deleteArchivedRevisions.inc b/maintenance/deleteArchivedRevisions.inc index 7628985cb4..197ffab581 100644 --- a/maintenance/deleteArchivedRevisions.inc +++ b/maintenance/deleteArchivedRevisions.inc @@ -34,7 +34,7 @@ class DeleteArchivedRevisionsImplementation { static public function doDelete( $maint ) { $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $tbl_arch = $dbw->tableName( 'archive' ); @@ -49,7 +49,7 @@ class DeleteArchivedRevisionsImplementation { # This bit's done # Purge redundant text records - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( $deletedRows ) { $maint->purgeRedundantText( true ); } diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php index 56fe13a418..8963ae1b55 100644 --- a/maintenance/deleteBatch.php +++ b/maintenance/deleteBatch.php @@ -89,7 +89,7 @@ class DeleteBatch extends Maintenance { } $this->output( $title->getPrefixedText() ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); if ( $title->getNamespace() == NS_FILE ) { $img = wfFindFile( $title ); if ( $img && $img->isLocal() && !$img->delete( $reason ) ) { @@ -99,7 +99,7 @@ class DeleteBatch extends Maintenance { $page = WikiPage::factory( $title ); $error = ''; $success = $page->doDeleteArticle( $reason, false, 0, false, $error, $user ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( $success ) { $this->output( " Deleted!\n" ); } else { diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php index 21d7755fbd..73947e9fa2 100644 --- a/maintenance/deleteDefaultMessages.php +++ b/maintenance/deleteDefaultMessages.php @@ -68,10 +68,10 @@ class DeleteDefaultMessages extends Maintenance { $dbw->ping(); $title = Title::makeTitle( $row->page_namespace, $row->page_title ); $page = WikiPage::factory( $title ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $error = ''; // Passed by ref $page->doDeleteArticle( 'No longer required', false, 0, false, $error, $user ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); } $this->output( 'done!', 'msg' ); diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php index 2cb347fcb9..8347a29352 100644 --- a/maintenance/deleteOldRevisions.php +++ b/maintenance/deleteOldRevisions.php @@ -41,7 +41,7 @@ class DeleteOldRevisions extends Maintenance { # Data should come off the master, wrapped in a transaction $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $tbl_pag = $dbw->tableName( 'page' ); $tbl_rev = $dbw->tableName( 'revision' ); @@ -90,7 +90,7 @@ class DeleteOldRevisions extends Maintenance { # This bit's done # Purge redundant text records - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( $delete ) { $this->purgeRedundantText( true ); } diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php index c322320b01..9fe5794302 100644 --- a/maintenance/deleteOrphanedRevisions.php +++ b/maintenance/deleteOrphanedRevisions.php @@ -39,7 +39,7 @@ class DeleteOrphanedRevisions extends Maintenance { $report = $this->hasOption( 'report' ); $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); list( $page, $revision ) = $dbw->tableNamesN( 'page', 'revision' ); # Find all the orphaned revisions @@ -66,7 +66,7 @@ class DeleteOrphanedRevisions extends Maintenance { $this->output( "done.\n" ); # Close the transaction and call the script to purge unused text records - $dbw->commit(); + $dbw->commit( __METHOD__ ); $this->purgeRedundantText( true ); } diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php index 3c6888aec3..a37fd80f34 100644 --- a/maintenance/fixSlaveDesync.php +++ b/maintenance/fixSlaveDesync.php @@ -88,7 +88,7 @@ class FixSlaveDesync extends Maintenance { private function desyncFixPage( $pageID ) { # Check for a corrupted page_latest $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $realLatest = $dbw->selectField( 'page', 'page_latest', array( 'page_id' => $pageID ), __METHOD__, 'FOR UPDATE' ); # list( $masterFile, $masterPos ) = $dbw->getMasterPos(); @@ -112,7 +112,7 @@ class FixSlaveDesync extends Maintenance { } if ( !$found ) { $this->output( "page_id $pageID seems fine\n" ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); return; } @@ -199,7 +199,7 @@ class FixSlaveDesync extends Maintenance { } $this->output( "done\n" ); } - $dbw->commit(); + $dbw->commit( __METHOD__ ); } } diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php index 771ed947e9..297aaf3691 100644 --- a/maintenance/migrateUserGroup.php +++ b/maintenance/migrateUserGroup.php @@ -50,14 +50,14 @@ class MigrateUserGroup extends Maintenance { // Migrate users over in batches... while ( $blockEnd <= $end ) { $this->output( "Doing users $blockStart to $blockEnd\n" ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dbw->update( 'user_groups', array( 'ug_group' => $newGroup ), array( 'ug_group' => $oldGroup, "ug_user BETWEEN $blockStart AND $blockEnd" ) ); $count += $dbw->affectedRows(); - $dbw->commit(); + $dbw->commit( __METHOD__ ); $blockStart += $this->mBatchSize; $blockEnd += $this->mBatchSize; wfWaitForSlaves(); diff --git a/maintenance/nukeNS.php b/maintenance/nukeNS.php index 57417508d1..5d4f374c9c 100644 --- a/maintenance/nukeNS.php +++ b/maintenance/nukeNS.php @@ -49,7 +49,7 @@ class NukeNS extends Maintenance { $delete = $this->getOption( 'delete', false ); $all = $this->getOption( 'all', false ); $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $tbl_pag = $dbw->tableName( 'page' ); $tbl_rev = $dbw->tableName( 'revision' ); @@ -80,7 +80,7 @@ class NukeNS extends Maintenance { // I already have the id & revs if ( $delete ) { $dbw->query( "DELETE FROM $tbl_pag WHERE page_id = $id" ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); // Delete revisions as appropriate $child = $this->runChild( 'NukePage', 'nukePage.php' ); $child->deleteRevisions( $revs ); @@ -91,7 +91,7 @@ class NukeNS extends Maintenance { $this->output( "skip: " . $title->getPrefixedText() . "\n" ); } } - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( $n_deleted > 0 ) { # update statistics - better to decrement existing count, or just count diff --git a/maintenance/nukePage.php b/maintenance/nukePage.php index c818e73a31..5031b589a3 100644 --- a/maintenance/nukePage.php +++ b/maintenance/nukePage.php @@ -38,7 +38,7 @@ class NukePage extends Maintenance { $delete = $this->getOption( 'delete', false ); $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $tbl_pag = $dbw->tableName( 'page' ); $tbl_rec = $dbw->tableName( 'recentchanges' ); @@ -93,20 +93,20 @@ class NukePage extends Maintenance { } } else { $this->output( "not found in database.\n" ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); } } public function deleteRevisions( $ids ) { $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $tbl_rev = $dbw->tableName( 'revision' ); $set = implode( ', ', $ids ); $dbw->query( "DELETE FROM $tbl_rev WHERE rev_id IN ( $set )" ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); } } diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php index 2b0e2d64c4..eaac68c67c 100644 --- a/maintenance/populateLogUsertext.php +++ b/maintenance/populateLogUsertext.php @@ -59,12 +59,12 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance { $res = $db->select( array( 'logging', 'user' ), array( 'log_id', 'user_name' ), $cond, __METHOD__ ); - $db->begin(); + $db->begin( __METHOD__ ); foreach ( $res as $row ) { $db->update( 'logging', array( 'log_user_text' => $row->user_name ), array( 'log_id' => $row->log_id ), __METHOD__ ); } - $db->commit(); + $db->commit( __METHOD__ ); $blockStart += $this->mBatchSize; $blockEnd += $this->mBatchSize; wfWaitForSlaves(); diff --git a/maintenance/populateRevisionSha1.php b/maintenance/populateRevisionSha1.php index 7cb137dad0..e829848c31 100644 --- a/maintenance/populateRevisionSha1.php +++ b/maintenance/populateRevisionSha1.php @@ -81,13 +81,13 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance { AND $idCol IS NOT NULL AND {$prefix}_sha1 = ''"; $res = $db->select( $table, '*', $cond, __METHOD__ ); - $db->begin(); + $db->begin( __METHOD__ ); foreach ( $res as $row ) { if ( $this->upgradeRow( $row, $table, $idCol, $prefix ) ) { $count++; } } - $db->commit(); + $db->commit( __METHOD__ ); $blockStart += $this->mBatchSize; $blockEnd += $this->mBatchSize; @@ -102,20 +102,20 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance { $res = $db->select( 'archive', '*', array( 'ar_rev_id IS NULL' ), __METHOD__ ); $updateSize = 0; - $db->begin(); + $db->begin( __METHOD__ ); foreach ( $res as $row ) { if ( $this->upgradeLegacyArchiveRow( $row ) ) { ++$count; } if ( ++$updateSize >= 100 ) { $updateSize = 0; - $db->commit(); + $db->commit( __METHOD__ ); $this->output( "Commited row with ar_timestamp={$row->ar_timestamp}\n" ); wfWaitForSlaves(); - $db->begin(); + $db->begin( __METHOD__ ); } } - $db->commit(); + $db->commit( __METHOD__ ); } protected function upgradeRow( $row, $table, $idCol, $prefix ) { diff --git a/maintenance/purgeOldText.inc b/maintenance/purgeOldText.inc index 45a7ae2821..111c786aa9 100644 --- a/maintenance/purgeOldText.inc +++ b/maintenance/purgeOldText.inc @@ -27,7 +27,7 @@ function PurgeRedundantText( $delete = false ) { # Data should come off the master, wrapped in a transaction $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $tbl_arc = $dbw->tableName( 'archive' ); $tbl_rev = $dbw->tableName( 'revision' ); @@ -73,6 +73,6 @@ function PurgeRedundantText( $delete = false ) { } # Done - $dbw->commit(); + $dbw->commit( __METHOD__ ); } diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php index 132d326d0d..da9fa5396e 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -68,7 +68,7 @@ class ReassignEdits extends Maintenance { */ private function doReassignEdits( &$from, &$to, $rc = false, $report = false ) { $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); # Count things $this->output( "Checking current edits..." ); @@ -117,7 +117,7 @@ class ReassignEdits extends Maintenance { } } - $dbw->commit(); + $dbw->commit( __METHOD__ ); return (int)$total; } diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php index e7ce3521c7..ea07f19515 100644 --- a/maintenance/rebuildFileCache.php +++ b/maintenance/rebuildFileCache.php @@ -93,7 +93,7 @@ class RebuildFileCache extends Maintenance { array( 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' ) ); - $dbw->begin(); // for any changes + $dbw->begin( __METHOD__ ); // for any changes foreach ( $res as $row ) { $rebuilt = false; $wgRequestTime = microtime( true ); # bug 22852 @@ -139,7 +139,7 @@ class RebuildFileCache extends Maintenance { $this->output( "Page {$row->page_id} not cacheable\n" ); } } - $dbw->commit(); // commit any changes (just for sanity) + $dbw->commit( __METHOD__ ); // commit any changes (just for sanity) $blockStart += $this->mBatchSize; $blockEnd += $this->mBatchSize; diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php index 41967d1ffd..7abbc907a9 100644 --- a/maintenance/refreshLinks.php +++ b/maintenance/refreshLinks.php @@ -217,13 +217,13 @@ class RefreshLinks extends Maintenance { return; } - $dbw->begin(); + $dbw->begin( __METHOD__ ); $options = new ParserOptions; $parserOutput = $wgParser->parse( $revision->getText(), $title, $options, true, true, $revision->getId() ); $update = new LinksUpdate( $title, $parserOutput, false ); $update->doUpdate(); - $dbw->commit(); + $dbw->commit( __METHOD__ ); } /** diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php index 9c832e359a..b288c2fb48 100644 --- a/maintenance/removeUnusedAccounts.php +++ b/maintenance/removeUnusedAccounts.php @@ -95,12 +95,12 @@ class RemoveUnusedAccounts extends Maintenance { 'image' => 'img', 'oldimage' => 'oi', 'filearchive' => 'fa' ); $count = 0; - $dbo->begin(); + $dbo->begin( __METHOD__ ); foreach ( $checks as $table => $fprefix ) { $conds = array( $fprefix . '_user' => $id ); $count += (int)$dbo->selectField( $table, 'COUNT(*)', $conds, __METHOD__ ); } - $dbo->commit(); + $dbo->commit( __METHOD__ ); return $count == 0; } diff --git a/maintenance/storage/fixBug20757.php b/maintenance/storage/fixBug20757.php index cb2663d1f3..cf30b0e6b7 100644 --- a/maintenance/storage/fixBug20757.php +++ b/maintenance/storage/fixBug20757.php @@ -213,7 +213,7 @@ class FixBug20757 extends Maintenance { if ( !$dryRun ) { // Reset the text row to point to the original copy - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dbw->update( 'text', // SET @@ -241,7 +241,7 @@ class FixBug20757 extends Maintenance { ), __METHOD__ ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); $this->waitForSlaves(); } diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php index c8aac64b74..158aa34c4f 100644 --- a/maintenance/storage/recompressTracked.php +++ b/maintenance/storage/recompressTracked.php @@ -528,7 +528,7 @@ class RecompressTracked { exit( 1 ); } $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $dbw->update( 'text', array( // set 'old_text' => $url, @@ -544,7 +544,7 @@ class RecompressTracked { array( 'bt_text_id' => $textId ), __METHOD__ ); - $dbw->commit(); + $dbw->commit( __METHOD__ ); } /** @@ -739,7 +739,7 @@ class CgzCopyTransaction { // // We do a locking read to prevent closer-run race conditions. $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); $res = $dbw->select( 'blob_tracking', array( 'bt_text_id', 'bt_moved' ), array( 'bt_text_id' => array_keys( $this->referrers ) ), @@ -773,7 +773,7 @@ class CgzCopyTransaction { $store = $this->parent->store; $targetDB = $store->getMaster( $targetCluster ); $targetDB->clearFlag( DBO_TRX ); // we manage the transactions - $targetDB->begin(); + $targetDB->begin( __METHOD__ ); $baseUrl = $this->parent->store->store( $targetCluster, serialize( $this->cgz ) ); // Write the new URLs to the blob_tracking table @@ -789,10 +789,10 @@ class CgzCopyTransaction { ); } - $targetDB->commit(); + $targetDB->commit( __METHOD__ ); // Critical section here: interruption at this point causes blob duplication // Reversing the order of the commits would cause data loss instead - $dbw->commit(); + $dbw->commit( __METHOD__ ); // Write the new URLs to the text table and set the moved flag if ( !$this->parent->copyOnly ) { diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php index 023409fa8f..6160a3054b 100644 --- a/maintenance/updateCollation.php +++ b/maintenance/updateCollation.php @@ -104,7 +104,7 @@ TEXT; ); $this->output( " processing..." ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); foreach ( $res as $row ) { $title = Title::newFromRow( $row ); if ( !$row->cl_collation ) { @@ -143,7 +143,7 @@ TEXT; __METHOD__ ); } - $dbw->commit(); + $dbw->commit( __METHOD__ ); if ( $force && $row ) { $encFrom = $dbw->addQuotes( $row->cl_from ); -- 2.20.1