From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 11 Jul 2019 22:42:37 +0000 (+0000)
Subject: Merge "Optimize JobQueue utilization in UserGroupMembership::insert()"
X-Git-Tag: 1.34.0-rc.0~1050
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=7bdfadde3fe1b14ff633ff740f77d74585b8e00a;hp=9ded67d0da1e75fa3a23e915b498ddf7fd3a348b;p=lhc%2Fweb%2Fwiklou.git

Merge "Optimize JobQueue utilization in UserGroupMembership::insert()"
---

diff --git a/includes/user/UserGroupMembership.php b/includes/user/UserGroupMembership.php
index e06df9fd23..eb555672a2 100644
--- a/includes/user/UserGroupMembership.php
+++ b/includes/user/UserGroupMembership.php
@@ -159,7 +159,15 @@ class UserGroupMembership {
 		}
 
 		// Purge old, expired memberships from the DB
-		JobQueueGroup::singleton()->push( new UserGroupExpiryJob() );
+		$hasExpiredRow = $dbw->selectField(
+			'user_groups',
+			'1',
+			[ 'ug_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ],
+			__METHOD__
+		);
+		if ( $hasExpiredRow ) {
+			JobQueueGroup::singleton()->lazyPush( new UserGroupExpiryJob() );
+		}
 
 		// Check that the values make sense
 		if ( $this->group === null ) {