From: Timo Tijhof <krinklemail@gmail.com>
Date: Thu, 30 Nov 2017 20:36:36 +0000 (-0800)
Subject: jobs: Remove ClearUserWatchlistJob 'batchSize' option
X-Git-Tag: 1.31.0-rc.0~1342^2
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=9a65a14da695be79e7635b8d6ba2a2e370f1ac94;p=lhc%2Fweb%2Fwiklou.git

jobs: Remove ClearUserWatchlistJob 'batchSize' option

Use $wgUpdateRowsPerQuery instead, and use its value at run-time
instead of inside the job parameters. Also helps with deduplication
if batchSize is changed.

Change-Id: Ifef25a3ae5ae2418359a41eba05778613fbb548f
---

diff --git a/includes/jobqueue/jobs/ClearUserWatchlistJob.php b/includes/jobqueue/jobs/ClearUserWatchlistJob.php
index 17c4b665e2..3e8b2ad3e4 100644
--- a/includes/jobqueue/jobs/ClearUserWatchlistJob.php
+++ b/includes/jobqueue/jobs/ClearUserWatchlistJob.php
@@ -28,15 +28,10 @@ class ClearUserWatchlistJob extends Job {
 	/**
 	 * @param Title|null $title Not used by this job.
 	 * @param array $params
-	 *  - batchSize,      Number of watchlist entries to remove at once.
 	 *  - userId,         The ID for the user whose watchlist is being cleared.
 	 *  - maxWatchlistId, The maximum wl_id at the time the job was first created,
 	 */
 	public function __construct( Title $title = null, array $params ) {
-		if ( !array_key_exists( 'batchSize', $params ) ) {
-			$params['batchSize'] = 1000;
-		}
-
 		parent::__construct(
 			'clearUserWatchlist',
 			SpecialPage::getTitleFor( 'EditWatchlist', 'clear' ),
@@ -47,8 +42,10 @@ class ClearUserWatchlistJob extends Job {
 	}
 
 	public function run() {
+		global $wgUpdateRowsPerQuery;
 		$userId = $this->params['userId'];
 		$maxWatchlistId = $this->params['maxWatchlistId'];
+		$batchSize = $wgUpdateRowsPerQuery;
 
 		$loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer();
 		$dbw = $loadBalancer->getConnection( DB_MASTER );
@@ -86,7 +83,7 @@ class ClearUserWatchlistJob extends Job {
 			__METHOD__,
 			[
 				'ORDER BY' => 'wl_id ASC',
-				'LIMIT' => $this->params['batchSize'],
+				'LIMIT' => $batchSize,
 			]
 		);
 
@@ -101,7 +98,9 @@ class ClearUserWatchlistJob extends Job {
 		$lbf->commitMasterChanges( __METHOD__ );
 		unset( $scopedLock );
 
-		if ( count( $watchlistIds ) == $this->params['batchSize'] ) {
+		if ( count( $watchlistIds ) === (int)$batchSize ) {
+			// Until we get less results than the limit, recursively push
+			// the same job again.
 			JobQueueGroup::singleton()->push( new self( $this->getTitle(), $this->getParams() ) );
 		}
 
diff --git a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
index 385ecb75e8..b5257a33f9 100644
--- a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
@@ -48,12 +48,13 @@ class ClearUserWatchlistJobTest extends MediaWikiTestCase {
 		$watchedItemStore->addWatch( $user, new TitleValue( 0, 'C' ) );
 		$watchedItemStore->addWatch( $user, new TitleValue( 1, 'C' ) );
 
+		$this->setMwGlobals( 'wgUpdateRowsPerQuery', 2 );
+
 		JobQueueGroup::singleton()->push(
 			new ClearUserWatchlistJob(
 				null,
 				[
 					'userId' => $user->getId(),
-					'batchSize' => 2,
 					'maxWatchlistId' => $maxId,
 				]
 			)