From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 13 Sep 2016 02:56:09 +0000 (-0700)
Subject: Remove pointless getTransactionProfiler() method
X-Git-Tag: 1.31.0-rc.0~5629^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=6d68cf89fb08e2a3a56c0f489b30e6ee710b3306;p=lhc%2Fweb%2Fwiklou.git

Remove pointless getTransactionProfiler() method

Change-Id: Ib019e8317568105b95138cfdc0962b06a55154b9
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 0a1774dedb..c41e7c7b93 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -331,13 +331,6 @@ abstract class DatabaseBase implements IDatabase {
 		return $this->lazyMasterHandle;
 	}
 
-	/**
-	 * @return TransactionProfiler
-	 */
-	protected function getTransactionProfiler() {
-		return $this->trxProfiler;
-	}
-
 	/**
 	 * @param TransactionProfiler $profiler
 	 * @since 1.27
@@ -914,7 +907,7 @@ abstract class DatabaseBase implements IDatabase {
 		# Keep track of whether the transaction has write queries pending
 		if ( $this->mTrxLevel && !$this->mTrxDoneWrites && $isWrite ) {
 			$this->mTrxDoneWrites = true;
-			$this->getTransactionProfiler()->transactionWritingIn(
+			$this->trxProfiler->transactionWritingIn(
 				$this->mServer, $this->mDBname, $this->mTrxShortId );
 		}
 
@@ -1008,7 +1001,7 @@ abstract class DatabaseBase implements IDatabase {
 			$this->mRTTEstimate = $queryRuntime;
 		}
 
-		$this->getTransactionProfiler()->recordQueryCompletion(
+		$this->trxProfiler->recordQueryCompletion(
 			$queryProf, $startTime, $isWrite, $this->affectedRows()
 		);
 		MWDebug::query( $sql, $fname, $isMaster, $queryRuntime );
@@ -3014,7 +3007,7 @@ abstract class DatabaseBase implements IDatabase {
 		$this->doCommit( $fname );
 		if ( $this->mTrxDoneWrites ) {
 			$this->mDoneWrites = microtime( true );
-			$this->getTransactionProfiler()->transactionWritingOut(
+			$this->trxProfiler->transactionWritingOut(
 				$this->mServer, $this->mDBname, $this->mTrxShortId, $writeTime );
 		}
 
@@ -3058,7 +3051,7 @@ abstract class DatabaseBase implements IDatabase {
 		$this->doRollback( $fname );
 		$this->mTrxAtomicLevels = [];
 		if ( $this->mTrxDoneWrites ) {
-			$this->getTransactionProfiler()->transactionWritingOut(
+			$this->trxProfiler->transactionWritingOut(
 				$this->mServer, $this->mDBname, $this->mTrxShortId );
 		}