From 262da36ba002b1461a5ccf5d18759097884d2c5c Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 8 Sep 2016 06:03:22 -0700
Subject: [PATCH] Fix IDEA warnings in CategoryMembershipChangeJob

Change-Id: I0ee952c59cccf00167d468adb49d4bf811a80dc9
---
 .../jobs/CategoryMembershipChangeJob.php      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/includes/jobqueue/jobs/CategoryMembershipChangeJob.php b/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
index e6f59f3666..1828dd71a4 100644
--- a/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
+++ b/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
@@ -19,6 +19,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Job to add recent change entries mentioning category membership changes
@@ -48,7 +49,8 @@ class CategoryMembershipChangeJob extends Job {
 			return false; // deleted?
 		}
 
-		$dbw = wfGetDB( DB_MASTER );
+		$lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
+		$dbw = $lb->getConnection( DB_MASTER );
 		// Use a named lock so that jobs for this page see each others' changes
 		$lockKey = "CategoryMembershipUpdates:{$page->getId()}";
 		$scopedLock = $dbw->getScopedLockAndFlush( $lockKey, __METHOD__, 10 );
@@ -59,12 +61,12 @@ class CategoryMembershipChangeJob extends Job {
 
 		$dbr = wfGetDB( DB_REPLICA, [ 'recentchanges' ] );
 		// Wait till the replica DB is caught up so that jobs for this page see each others' changes
-		if ( !wfGetLB()->safeWaitForMasterPos( $dbr ) ) {
+		if ( !$lb->safeWaitForMasterPos( $dbr ) ) {
 			$this->setLastError( "Timed out while waiting for replica DB to catch up" );
 			return false;
 		}
 		// Clear any stale REPEATABLE-READ snapshot
-		wfGetLBFactory()->commitAll( __METHOD__ );
+		$dbr->flushSnapshot( __METHOD__ );
 
 		$cutoffUnix = wfTimestamp( TS_UNIX, $this->params['revTimestamp'] );
 		// Using ENQUEUE_FUDGE_SEC handles jobs inserted out of revision order due to the delay
@@ -118,19 +120,23 @@ class CategoryMembershipChangeJob extends Job {
 		);
 
 		// Apply all category updates in revision timestamp order
+		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 		foreach ( $res as $row ) {
-			$this->notifyUpdatesForRevision( $page, Revision::newFromRow( $row ) );
+			$this->notifyUpdatesForRevision( $lbFactory, $page, Revision::newFromRow( $row ) );
 		}
 
 		return true;
 	}
 
 	/**
+	 * @param LBFactory $lbFactory
 	 * @param WikiPage $page
 	 * @param Revision $newRev
 	 * @throws MWException
 	 */
-	protected function notifyUpdatesForRevision( WikiPage $page, Revision $newRev ) {
+	protected function notifyUpdatesForRevision(
+		LBFactory $lbFactory, WikiPage $page, Revision $newRev
+	) {
 		$config = RequestContext::getMain()->getConfig();
 		$title = $page->getTitle();
 
@@ -156,9 +162,7 @@ class CategoryMembershipChangeJob extends Job {
 			return; // nothing to do
 		}
 
-		$dbw = wfGetDB( DB_MASTER );
-		$factory = wfGetLBFactory();
-		$ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
+		$ticket = $lbFactory->getEmptyTransactionTicket( __METHOD__ );
 
 		$catMembChange = new CategoryMembershipChange( $title, $newRev );
 		$catMembChange->checkTemplateLinks();
@@ -170,7 +174,7 @@ class CategoryMembershipChangeJob extends Job {
 			$categoryTitle = Title::makeTitle( NS_CATEGORY, $categoryName );
 			$catMembChange->triggerCategoryAddedNotification( $categoryTitle );
 			if ( $insertCount++ && ( $insertCount % $batchSize ) == 0 ) {
-				$factory->commitAndWaitForReplication( __METHOD__, $ticket );
+				$lbFactory->commitAndWaitForReplication( __METHOD__, $ticket );
 			}
 		}
 
@@ -178,7 +182,7 @@ class CategoryMembershipChangeJob extends Job {
 			$categoryTitle = Title::makeTitle( NS_CATEGORY, $categoryName );
 			$catMembChange->triggerCategoryRemovedNotification( $categoryTitle );
 			if ( $insertCount++ && ( $insertCount++ % $batchSize ) == 0 ) {
-				$factory->commitAndWaitForReplication( __METHOD__, $ticket );
+				$lbFactory->commitAndWaitForReplication( __METHOD__, $ticket );
 			}
 		}
 	}
-- 
2.20.1