Merge "[JobQueue] Added __METHOD__ to delete() call."

diff --combined includes/job/JobQueueDB.php
index 2f483ed,9f31060..e23ff0d
--- 1/includes/job/JobQueueDB.php
--- 2/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@@ -174,7 -174,6 +174,7 @@@ class JobQueueDB extends JobQueue 
                        }
                        $job = Job::factory( $row->job_cmd, $title,
                                self::extractBlob( $row->job_params ), $row->job_id );
 +                      $job->id = $row->job_id; // XXX: work around broken subclasses
                        // Flag this job as an old duplicate based on its "root" job...
                        if ( $this->isRootJobOldDuplicate( $job ) ) {
                                $job = DuplicateJob::newFromJob( $job ); // convert to a no-op
@@@ -369,15 -368,12 +369,16 @@@
         * @return Job|bool
         */
        protected function doAck( Job $job ) {
 +              if ( !$job->getId() ) {
 +                      throw new MWException( "Job of type '{$job->getType()}' has no ID." );
 +              }
 +
                $dbw = $this->getMasterDB();
                $dbw->commit( __METHOD__, 'flush' ); // flush existing transaction
  
                // Delete a row with a single DELETE without holding row locks over RTTs...
-               $dbw->delete( 'job', array( 'job_cmd' => $this->type, 'job_id' => $job->getId() ) );
+               $dbw->delete( 'job',
+                       array( 'job_cmd' => $this->type, 'job_id' => $job->getId() ), __METHOD__ );
  
                return true;
        }