From: Platonides <platonides@gmail.com>
Date: Fri, 7 Dec 2012 19:30:45 +0000 (+0100)
Subject: Use JobQueueGroup::singleton()
X-Git-Tag: 1.31.0-rc.0~21391
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;ds=sidebyside;h=a1e7329d8f1af56cd64fc43ab15e3eaf74bbca9b;p=lhc%2Fweb%2Fwiklou.git

Use JobQueueGroup::singleton()

Replaces usages of the deprecated pop() and insert()/insertBatch()
methods of Job class.

Change-Id: I5572c9e31a14bd660d7e3b9aa7792d0be9a26103
---

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index daf74357a3..8d1ed6812f 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -498,7 +498,7 @@ class EmailNotification {
 				'pageStatus' => $pageStatus
 			);
 			$job = new EnotifNotifyJob( $title, $params );
-			$job->insert();
+			JobQueueGroup::singleton()->push( $job );
 		} else {
 			$this->actuallyNotifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid, $watchers, $pageStatus );
 		}
diff --git a/includes/job/jobs/DoubleRedirectJob.php b/includes/job/jobs/DoubleRedirectJob.php
index ddd4fcca15..fb73bf1ee2 100644
--- a/includes/job/jobs/DoubleRedirectJob.php
+++ b/includes/job/jobs/DoubleRedirectJob.php
@@ -66,11 +66,11 @@ class DoubleRedirectJob extends Job {
 				'redirTitle' => $redirTitle->getPrefixedDBkey() ) );
 			# Avoid excessive memory usage
 			if ( count( $jobs ) > 10000 ) {
-				Job::batchInsert( $jobs );
+				JobQueueGroup::singleton()->push( $jobs );
 				$jobs = array();
 			}
 		}
-		Job::batchInsert( $jobs );
+		JobQueueGroup::singleton()->push( $jobs );
 	}
 
 	function __construct( $title, $params = false, $id = 0 ) {
diff --git a/includes/job/jobs/NullJob.php b/includes/job/jobs/NullJob.php
index 99a8429f7c..4996984a8a 100644
--- a/includes/job/jobs/NullJob.php
+++ b/includes/job/jobs/NullJob.php
@@ -52,7 +52,7 @@ class NullJob extends Job {
 			$params = $this->params;
 			$params['lives']--;
 			$job = new self( $this->title, $params );
-			$job->insert();
+			JobQueueGroup::singleton()->push( $job );
 		}
 		return true;
 	}
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 7f430c50ad..70b6903458 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -332,7 +332,7 @@ class UploadFromUrl extends UploadBase {
 			'sessionKey' => $sessionKey,
 		) );
 		$job->initializeSessionData();
-		$job->insert();
+		JobQueueGroup::singleton()->push( $job );
 		return $sessionKey;
 	}
 
diff --git a/maintenance/fixDoubleRedirects.php b/maintenance/fixDoubleRedirects.php
index d808500d3d..19b977773e 100644
--- a/maintenance/fixDoubleRedirects.php
+++ b/maintenance/fixDoubleRedirects.php
@@ -129,7 +129,7 @@ class FixDoubleRedirects extends Maintenance {
 
 	protected function queueJobs( $jobs, $dryrun = false ) {
 		$this->output( "Queuing batch of " . count( $jobs ) . " double redirects.\n" );
-		Job::batchInsert( $dryrun ? array() : $jobs );
+		JobQueueGroup::singleton()->push( $dryrun ? array() : $jobs );
 	}
 }
 
diff --git a/tests/phpunit/includes/upload/UploadFromUrlTest.php b/tests/phpunit/includes/upload/UploadFromUrlTest.php
index 59663ba9f5..307810dc7c 100644
--- a/tests/phpunit/includes/upload/UploadFromUrlTest.php
+++ b/tests/phpunit/includes/upload/UploadFromUrlTest.php
@@ -36,9 +36,9 @@ class UploadFromUrlTest extends ApiTestCase {
 	 * Ensure that the job queue is empty before continuing
 	 */
 	public function testClearQueue() {
-		$job = Job::pop();
+		$job = JobQueueGroup::singleton()->pop();
 		while ( $job ) {
-			$job = Job::pop();
+			$job = JobQueueGroup::singleton()->pop();
 		}
 		$this->assertFalse( $job );
 	}
@@ -141,7 +141,7 @@ class UploadFromUrlTest extends ApiTestCase {
 
 		$this->assertEquals( $data[0]['upload']['result'], 'Queued', 'Queued upload' );
 
-		$job = Job::pop();
+		$job = JobQueueGroup::singleton()->pop();
 		$this->assertThat( $job, $this->isInstanceOf( 'UploadFromUrlJob' ), 'Queued upload inserted' );
 	}
 
@@ -202,7 +202,7 @@ class UploadFromUrlTest extends ApiTestCase {
 	public function testSyncDownload( $data ) {
 		$token = $this->user->getEditToken();
 
-		$job = Job::pop();
+		$job = JobQueueGroup::singleton()->pop();
 		$this->assertFalse( $job, 'Starting with an empty jobqueue' );
 
 		$this->user->addGroup( 'users' );
@@ -214,7 +214,7 @@ class UploadFromUrlTest extends ApiTestCase {
 			'token' => $token,
 		), $data );
 
-		$job = Job::pop();
+		$job = JobQueueGroup::singleton()->pop();
 		$this->assertFalse( $job );
 
 		$this->assertEquals( 'Success', $data[0]['upload']['result'] );
@@ -244,7 +244,7 @@ class UploadFromUrlTest extends ApiTestCase {
 			'ignorewarnings' => 1,
 		) );
 
-		$job = Job::pop();
+		$job = JobQueueGroup::singleton()->pop();
 		$this->assertEquals( 'UploadFromUrlJob', get_class( $job ) );
 		$job->run();
 
@@ -272,7 +272,7 @@ class UploadFromUrlTest extends ApiTestCase {
 		}
 		$this->assertTrue( $exception );
 
-		$job = Job::pop();
+		$job = JobQueueGroup::singleton()->pop();
 		$this->assertFalse( $job );
 
 		return;
@@ -314,7 +314,7 @@ class UploadFromUrlTest extends ApiTestCase {
 		$this->assertTrue( isset( $data[0]['upload']['statuskey'] ) );
 		$statusKey = $data[0]['upload']['statuskey'];
 
-		$job = Job::pop();
+		$job = JobQueueGroup::singleton()->pop();
 		$this->assertEquals( 'UploadFromUrlJob', get_class( $job ) );
 
 		$status = $job->run();