X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdeferred%2FUserEditCountUpdate.php;h=4333c940421ddf9ae6362903ead9f9e5a62bec5c;hb=621e37c1857167cf9333fd7a4ee8c339ac83155a;hp=3ccb4a8cc10d727d23fe9231b188c1047f616d20;hpb=1bfdb65439f65c68e63d931d4d33e10809101c92;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/deferred/UserEditCountUpdate.php b/includes/deferred/UserEditCountUpdate.php
index 3ccb4a8cc1..4333c94042 100644
--- a/includes/deferred/UserEditCountUpdate.php
+++ b/includes/deferred/UserEditCountUpdate.php
@@ -46,6 +46,7 @@ class UserEditCountUpdate implements DeferrableUpdate, MergeableUpdate {
 	public function merge( MergeableUpdate $update ) {
 		/** @var UserEditCountUpdate $update */
 		Assert::parameterType( __CLASS__, $update, '$update' );
+		'@phan-var UserEditCountUpdate $update';
 
 		foreach ( $update->infoByUser as $userId => $info ) {
 			if ( !isset( $this->infoByUser[$userId] ) ) {
@@ -67,7 +68,7 @@ class UserEditCountUpdate implements DeferrableUpdate, MergeableUpdate {
 	 */
 	public function doUpdate() {
 		$lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
-		$dbw = $lb->getConnection( DB_MASTER );
+		$dbw = $lb->getConnectionRef( DB_MASTER );
 		$fname = __METHOD__;
 
 		( new AutoCommitUpdate( $dbw, __METHOD__, function () use ( $lb, $dbw, $fname ) {
@@ -82,16 +83,15 @@ class UserEditCountUpdate implements DeferrableUpdate, MergeableUpdate {
 				$affectedInstances = $info['instances'];
 				// Lazy initialization check...
 				if ( $dbw->affectedRows() == 0 ) {
-					// No rows will be "affected" if user_editcount is NULL.
-					// Check if the generic "replica" connection is not the master.
-					$dbr = $lb->getConnection( DB_REPLICA );
-					if ( $dbr !== $dbw ) {
-						// This method runs after the new revisions were committed.
-						// Wait for the replica to catch up so they will all be counted.
-						$dbr->flushSnapshot( $fname );
-						$lb->waitForMasterPos( $dbr );
-					}
-					$affectedInstances[0]->initEditCountInternal();
+					// The user_editcount is probably NULL (e.g. not initialized).
+					// Since this update runs after the new revisions were committed,
+					// wait for the replica DB to catch up so they will be counted.
+					$dbr = $lb->getConnectionRef( DB_REPLICA );
+					// If $dbr is actually the master DB, then clearing the snapshot
+					// is harmless and waitForMasterPos() will just no-op.
+					$dbr->flushSnapshot( $fname );
+					$lb->waitForMasterPos( $dbr );
+					$affectedInstances[0]->initEditCountInternal( $dbr );
 				}
 				$newCount = (int)$dbw->selectField(
 					'user',