From 7cc01d56b266ec47e66763c55ee0b71d7352466e Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Sat, 1 Dec 2012 15:04:10 +0100
Subject: [PATCH] Add some __METHOD__ to begin/commit/rollback calls

Change-Id: I20dad8d6bb7a523e8a6f50bc0af5cdba57d7160f
---
 includes/WikiPage.php                   | 4 ++--
 includes/filerepo/file/LocalFile.php    | 4 ++--
 includes/job/JobQueueDB.php             | 6 +++---
 includes/upload/UploadFromChunks.php    | 4 ++--
 maintenance/cleanupPreferences.php      | 4 ++--
 maintenance/convertUserOptions.php      | 2 +-
 maintenance/deleteOrphanedRevisions.php | 2 +-
 tests/testHelpers.inc                   | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index a4bc6ee824..0b588cba3a 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -1736,7 +1736,7 @@ class WikiPage extends Page implements IDBAccessObject {
 				$status->merge( $prepStatus );
 
 				if ( !$status->isOK() ) {
-					$dbw->rollback();
+					$dbw->rollback( __METHOD__ );
 
 					wfProfileOut( __METHOD__ );
 					return $status;
@@ -1815,7 +1815,7 @@ class WikiPage extends Page implements IDBAccessObject {
 			$status->merge( $prepStatus );
 
 			if ( !$status->isOK() ) {
-				$dbw->rollback();
+				$dbw->rollback( __METHOD__ );
 
 				wfProfileOut( __METHOD__ );
 				return $status;
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index e8f2540bf9..3525594dd2 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1213,13 +1213,13 @@ class LocalFile extends File {
 			$status = $wikiPage->doEditContent( $content, $comment, EDIT_NEW | EDIT_SUPPRESS_RC, false, $user );
 
 			if ( isset( $status->value['revision'] ) ) { // XXX; doEdit() uses a transaction
-				$dbw->begin();
+				$dbw->begin( __METHOD__ );
 				$dbw->update( 'logging',
 					array( 'log_page' => $status->value['revision']->getPage() ),
 					array( 'log_id' => $logId ),
 					__METHOD__
 				);
-				$dbw->commit(); // commit before anything bad can happen
+				$dbw->commit( __METHOD__ ); // commit before anything bad can happen
 			}
 		}
 		wfProfileOut( __METHOD__ . '-edit' );
diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index 0c01db7d42..80bc6d5898 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -77,7 +77,7 @@ class JobQueueDB extends JobQueue {
 
 				$autoTrx = $dbw->getFlag( DBO_TRX ); // automatic begin() enabled?
 				if ( $atomic ) {
-					$dbw->begin(); // wrap all the job additions in one transaction
+					$dbw->begin( __METHOD__ ); // wrap all the job additions in one transaction
 				} else {
 					$dbw->clearFlag( DBO_TRX ); // make each query its own transaction
 				}
@@ -87,14 +87,14 @@ class JobQueueDB extends JobQueue {
 					}
 				} catch ( DBError $e ) {
 					if ( $atomic ) {
-						$dbw->rollback();
+						$dbw->rollback( __METHOD__ );
 					} else {
 						$dbw->setFlag( $autoTrx ? DBO_TRX : 0 ); // restore automatic begin()
 					}
 					throw $e;
 				}
 				if ( $atomic ) {
-					$dbw->commit();
+					$dbw->commit( __METHOD__ );
 				} else {
 					$dbw->setFlag( $autoTrx ? DBO_TRX : 0 ); // restore automatic begin()
 				}
diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index e923c20783..0a13683e8f 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -212,7 +212,7 @@ class UploadFromChunks extends UploadFromFile {
 		$dbw = $this->repo->getMasterDb();
 		// Use a quick transaction since we will upload the full temp file into shared
 		// storage, which takes time for large files. We don't want to hold locks then.
-		$dbw->begin();
+		$dbw->begin( __METHOD__ );
 		$dbw->update(
 			'uploadstash',
 			array(
@@ -223,7 +223,7 @@ class UploadFromChunks extends UploadFromFile {
 			array( 'us_key' => $this->mFileKey ),
 			__METHOD__
 		);
-		$dbw->commit();
+		$dbw->commit( __METHOD__ );
 	}
 
 	/**
diff --git a/maintenance/cleanupPreferences.php b/maintenance/cleanupPreferences.php
index 3539689a3e..c0a526b7ff 100644
--- a/maintenance/cleanupPreferences.php
+++ b/maintenance/cleanupPreferences.php
@@ -35,7 +35,7 @@ class CleanupPreferences extends Maintenance {
 		global $wgHiddenPrefs;
 
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin();
+		$dbw->begin( __METHOD__ );
 		foreach( $wgHiddenPrefs as $item ) {
 			$dbw->delete(
 				'user_properties',
@@ -43,7 +43,7 @@ class CleanupPreferences extends Maintenance {
 				__METHOD__
 			);
 		};
-		$dbw->commit();
+		$dbw->commit( __METHOD__ );
 		$this->output( "Finished!\n" );
 	}
 }
diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index 7c9ca2696f..e2223e1a78 100644
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -56,7 +56,7 @@ class ConvertUserOptions extends Maintenance {
 				array( 'LIMIT' => 50, 'FOR UPDATE' )
 			);
 			$id = $this->convertOptionBatch( $res, $dbw );
-			$dbw->commit();
+			$dbw->commit( __METHOD__ );
 
 			wfWaitForSlaves();
 
diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php
index 5dc7567fc7..dcbf739991 100644
--- a/maintenance/deleteOrphanedRevisions.php
+++ b/maintenance/deleteOrphanedRevisions.php
@@ -61,7 +61,7 @@ class DeleteOrphanedRevisions extends Maintenance {
 
 		# Nothing to do?
 		if ( $report || $count == 0 ) {
-			$dbw->commit();
+			$dbw->commit( __METHOD__ );
 			exit( 0 );
 		}
 
diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc
index 4b2e923abf..f1eb833cbc 100644
--- a/tests/testHelpers.inc
+++ b/tests/testHelpers.inc
@@ -275,7 +275,7 @@ class DbTestRecorder extends DbTestPreviewer  {
 	 * and all that fun stuff
 	 */
 	function start() {
-		$this->db->begin();
+		$this->db->begin( __METHOD__ );
 
 		if ( ! $this->db->tableExists( 'testrun' )
 			|| ! $this->db->tableExists( 'testitem' ) )
-- 
2.20.1