nextcloud / server

lib/public/BackgroundJob/Job.php

Indentation +78 added lines, -78 removed lines

@@ -22,82 +22,82 @@
  * @since 33.0.0 removed deprecated `execute()` method
  */
 abstract class Job implements IJob, IParallelAwareJob {
-	protected string $id = '0';
-	protected int $lastRun = 0;
-	protected mixed $argument = null;
-	protected bool $allowParallelRuns = true;
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function __construct(
-		protected ITimeFactory $time,
-	) {
-	}
-
-	#[Override]
-	public function start(IJobList $jobList): void {
-		$jobList->setLastRun($this);
-		$logger = \OCP\Server::get(LoggerInterface::class);
-
-		try {
-			$jobDetails = get_class($this) . ' (id: ' . $this->getId() . ', arguments: ' . json_encode($this->getArgument()) . ')';
-			$jobStartTime = $this->time->getTime();
-			$logger->debug('Starting job ' . $jobDetails, ['app' => 'cron']);
-			$this->run($this->argument);
-			$timeTaken = $this->time->getTime() - $jobStartTime;
-
-			$logger->debug('Finished job ' . $jobDetails . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
-			$jobList->setExecutionTime($this, $timeTaken);
-		} catch (\Throwable $e) {
-			if ($logger) {
-				$logger->error('Error while running background job ' . $jobDetails, [
-					'app' => 'core',
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	#[Override]
-	final public function setId(string $id): void {
-		$this->id = $id;
-	}
-
-	#[Override]
-	final public function setLastRun(int $lastRun): void {
-		$this->lastRun = $lastRun;
-	}
-
-	#[Override]
-	public function setArgument(mixed $argument): void {
-		$this->argument = $argument;
-	}
-
-	#[Override]
-	final public function getId(): string {
-		return $this->id;
-	}
-
-	#[Override]
-	final public function getLastRun(): int {
-		return $this->lastRun;
-	}
-
-	#[Override]
-	public function getArgument(): mixed {
-		return $this->argument;
-	}
-
-	#[Override]
-	public function setAllowParallelRuns(bool $allow): void {
-		$this->allowParallelRuns = $allow;
-	}
-
-	#[Override]
-	public function getAllowParallelRuns(): bool {
-		return $this->allowParallelRuns;
-	}
-
-	abstract protected function run($argument);
+    protected string $id = '0';
+    protected int $lastRun = 0;
+    protected mixed $argument = null;
+    protected bool $allowParallelRuns = true;
+
+    /**
+     * @since 15.0.0
+     */
+    public function __construct(
+        protected ITimeFactory $time,
+    ) {
+    }
+
+    #[Override]
+    public function start(IJobList $jobList): void {
+        $jobList->setLastRun($this);
+        $logger = \OCP\Server::get(LoggerInterface::class);
+
+        try {
+            $jobDetails = get_class($this) . ' (id: ' . $this->getId() . ', arguments: ' . json_encode($this->getArgument()) . ')';
+            $jobStartTime = $this->time->getTime();
+            $logger->debug('Starting job ' . $jobDetails, ['app' => 'cron']);
+            $this->run($this->argument);
+            $timeTaken = $this->time->getTime() - $jobStartTime;
+
+            $logger->debug('Finished job ' . $jobDetails . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+            $jobList->setExecutionTime($this, $timeTaken);
+        } catch (\Throwable $e) {
+            if ($logger) {
+                $logger->error('Error while running background job ' . $jobDetails, [
+                    'app' => 'core',
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    #[Override]
+    final public function setId(string $id): void {
+        $this->id = $id;
+    }
+
+    #[Override]
+    final public function setLastRun(int $lastRun): void {
+        $this->lastRun = $lastRun;
+    }
+
+    #[Override]
+    public function setArgument(mixed $argument): void {
+        $this->argument = $argument;
+    }
+
+    #[Override]
+    final public function getId(): string {
+        return $this->id;
+    }
+
+    #[Override]
+    final public function getLastRun(): int {
+        return $this->lastRun;
+    }
+
+    #[Override]
+    public function getArgument(): mixed {
+        return $this->argument;
+    }
+
+    #[Override]
+    public function setAllowParallelRuns(bool $allow): void {
+        $this->allowParallelRuns = $allow;
+    }
+
+    #[Override]
+    public function getAllowParallelRuns(): bool {
+        return $this->allowParallelRuns;
+    }
+
+    abstract protected function run($argument);
 }

lib/public/BackgroundJob/IJob.php

Indentation +56 added lines, -56 removed lines

@@ -18,67 +18,67 @@
  * @since 33.0.0 removed deprecated `execute()` method
  */
 interface IJob {
-	/**
-	 * @since 24.0.0
-	 */
-	public const TIME_INSENSITIVE = 0;
-	/**
-	 * @since 24.0.0
-	 */
-	public const TIME_SENSITIVE = 1;
+    /**
+     * @since 24.0.0
+     */
+    public const TIME_INSENSITIVE = 0;
+    /**
+     * @since 24.0.0
+     */
+    public const TIME_SENSITIVE = 1;
 
-	/**
-	 * Start the background job with the registered argument
-	 *
-	 * This methods will take care of running the background job, of initializing
-	 * the state and cleaning up the job list after running the job.
-	 *
-	 * For common background job scenario, you will want to use TimedJob or QueuedJob
-	 * instead of overwriting this method.
-	 *
-	 * @param IJobList $jobList The job list that manages the state of this job
-	 * @since 25.0.0
-	 */
-	public function start(IJobList $jobList): void;
+    /**
+     * Start the background job with the registered argument
+     *
+     * This methods will take care of running the background job, of initializing
+     * the state and cleaning up the job list after running the job.
+     *
+     * For common background job scenario, you will want to use TimedJob or QueuedJob
+     * instead of overwriting this method.
+     *
+     * @param IJobList $jobList The job list that manages the state of this job
+     * @since 25.0.0
+     */
+    public function start(IJobList $jobList): void;
 
-	/**
-	 * @since 7.0.0
-	 * @since 33.0.0 Parameter $id changed from int to string
-	 */
-	public function setId(string $id): void;
+    /**
+     * @since 7.0.0
+     * @since 33.0.0 Parameter $id changed from int to string
+     */
+    public function setId(string $id): void;
 
-	/**
-	 * @since 7.0.0
-	 */
-	public function setLastRun(int $lastRun): void;
+    /**
+     * @since 7.0.0
+     */
+    public function setLastRun(int $lastRun): void;
 
-	/**
-	 * @param mixed $argument
-	 * @since 7.0.0
-	 */
-	public function setArgument(mixed $argument): void;
+    /**
+     * @param mixed $argument
+     * @since 7.0.0
+     */
+    public function setArgument(mixed $argument): void;
 
-	/**
-	 * Get the id of the background job
-	 * This id is determined by the job list when a job is added to the list
-	 *
-	 * @since 7.0.0
-	 * @since 33.0.0 The return type changed from int to string
-	 */
-	public function getId(): string;
+    /**
+     * Get the id of the background job
+     * This id is determined by the job list when a job is added to the list
+     *
+     * @since 7.0.0
+     * @since 33.0.0 The return type changed from int to string
+     */
+    public function getId(): string;
 
-	/**
-	 * Get the last time this job was run as unix timestamp
-	 *
-	 * @since 7.0.0
-	 */
-	public function getLastRun(): int;
+    /**
+     * Get the last time this job was run as unix timestamp
+     *
+     * @since 7.0.0
+     */
+    public function getLastRun(): int;
 
-	/**
-	 * Get the argument associated with the background job
-	 * This is the argument that will be passed to the background job
-	 *
-	 * @since 7.0.0
-	 */
-	public function getArgument(): mixed;
+    /**
+     * Get the argument associated with the background job
+     * This is the argument that will be passed to the background job
+     *
+     * @since 7.0.0
+     */
+    public function getArgument(): mixed;
 }

lib/public/BackgroundJob/IJobList.php

Indentation +141 added lines, -141 removed lines

@@ -32,145 +32,145 @@
  */
 #[Consumable(since: '7.0.0')]
 interface IJobList {
-	/**
-	 * Add a job to the list
-	 *
-	 * @param IJob|class-string<IJob> $job
-	 * @param mixed $argument The argument to be passed to $job->run() when the job is executed
-	 * @since 7.0.0
-	 */
-	public function add(IJob|string $job, mixed $argument = null): void;
-
-	/**
-	 * Add a job to the list but only run it after the given timestamp
-	 *
-	 * For cron background jobs this means the job will likely run shortly after the timestamp
-	 * has been reached. For ajax background jobs the job might only run when users are active
-	 * on the instance again.
-	 *
-	 * @param class-string<IJob> $job
-	 * @param mixed $argument The serializable argument to be passed to $job->run() when the job is executed
-	 * @since 28.0.0
-	 */
-	public function scheduleAfter(string $job, int $runAfter, mixed $argument = null): void;
-
-	/**
-	 * Remove a job from the list
-	 *
-	 * @param IJob|class-string<IJob> $job
-	 * @param mixed $argument
-	 * @since 7.0.0
-	 */
-	public function remove(IJob|string $job, mixed $argument = null): void;
-
-	/**
-	 * Remove a job from the list by id
-	 *
-	 * @since 30.0.0
-	 * @since 33.0.0 Parameter $id changed from int to string
-	 */
-	public function removeById(string $id): void;
-
-	/**
-	 * check if a job is in the list
-	 *
-	 * @param IJob|class-string<IJob> $job
-	 * @param mixed $argument
-	 * @since 7.0.0
-	 */
-	public function has(IJob|string $job, mixed $argument): bool;
-
-	/**
-	 * Get jobs matching the search
-	 *
-	 * @param IJob|class-string<IJob>|null $job
-	 * @return array<IJob>
-	 * @since 25.0.0
-	 * @deprecated 26.0.0 Use getJobsIterator instead to avoid duplicated job objects
-	 */
-	public function getJobs(IJob|string|null $job, ?int $limit, int $offset): array;
-
-	/**
-	 * Get jobs matching the search
-	 *
-	 * @param IJob|class-string<IJob>|null $job
-	 * @return iterable<IJob>
-	 * @since 26.0.0
-	 */
-	public function getJobsIterator(IJob|string|null $job, ?int $limit, int $offset): iterable;
-
-	/**
-	 * Get the next job in the list
-	 *
-	 * @param bool $onlyTimeSensitive Whether we get only time sensitive jobs or not
-	 * @param class-string<IJob>[]|null $jobClasses List of job classes to restrict which next job we get
-	 * @return ?IJob the next job to run. Beware that this object may be a singleton and may be modified by the next call to buildJob.
-	 * @since 7.0.0 - In 24.0.0 parameter $onlyTimeSensitive got added; In 30.0.0 parameter $jobClasses got added
-	 */
-	public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = null): ?IJob;
-
-	/**
-	 * @since 7.0.0
-	 * @since 33.0.0 Parameter $id changed from int to string
-	 */
-	public function getById(string $id): ?IJob;
-
-	/**
-	 * @since 23.0.0
-	 * @since 33.0.0 Parameter $id changed from int to string
-	 */
-	public function getDetailsById(string $id): ?array;
-
-	/**
-	 * set the job that was last ran to the current time
-	 *
-	 * @since 7.0.0
-	 */
-	public function setLastJob(IJob $job): void;
-
-	/**
-	 * Remove the reservation for a job
-	 *
-	 * @since 9.1.0
-	 */
-	public function unlockJob(IJob $job): void;
-
-	/**
-	 * set the lastRun of $job to now
-	 *
-	 * @since 7.0.0
-	 */
-	public function setLastRun(IJob $job): void;
-
-	/**
-	 * set the run duration of $job
-	 *
-	 * @since 12.0.0
-	 */
-	public function setExecutionTime(IJob $job, int $timeTaken): void;
-
-	/**
-	 * Reset the $job so it executes on the next trigger
-	 *
-	 * @since 23.0.0
-	 */
-	public function resetBackgroundJob(IJob $job): void;
-
-	/**
-	 * Checks whether a job of the passed class was reserved to run
-	 * in the last 6h
-	 *
-	 * @param class-string<IJob>|null $className
-	 * @return bool
-	 * @since 27.0.0
-	 */
-	public function hasReservedJob(?string $className): bool;
-
-	/**
-	 * Returns a count of jobs per Job class
-	 *
-	 * @return list<array{class:class-string<IJob>, count:int}>
-	 * @since 30.0.0
-	 */
-	public function countByClass(): array;
+    /**
+     * Add a job to the list
+     *
+     * @param IJob|class-string<IJob> $job
+     * @param mixed $argument The argument to be passed to $job->run() when the job is executed
+     * @since 7.0.0
+     */
+    public function add(IJob|string $job, mixed $argument = null): void;
+
+    /**
+     * Add a job to the list but only run it after the given timestamp
+     *
+     * For cron background jobs this means the job will likely run shortly after the timestamp
+     * has been reached. For ajax background jobs the job might only run when users are active
+     * on the instance again.
+     *
+     * @param class-string<IJob> $job
+     * @param mixed $argument The serializable argument to be passed to $job->run() when the job is executed
+     * @since 28.0.0
+     */
+    public function scheduleAfter(string $job, int $runAfter, mixed $argument = null): void;
+
+    /**
+     * Remove a job from the list
+     *
+     * @param IJob|class-string<IJob> $job
+     * @param mixed $argument
+     * @since 7.0.0
+     */
+    public function remove(IJob|string $job, mixed $argument = null): void;
+
+    /**
+     * Remove a job from the list by id
+     *
+     * @since 30.0.0
+     * @since 33.0.0 Parameter $id changed from int to string
+     */
+    public function removeById(string $id): void;
+
+    /**
+     * check if a job is in the list
+     *
+     * @param IJob|class-string<IJob> $job
+     * @param mixed $argument
+     * @since 7.0.0
+     */
+    public function has(IJob|string $job, mixed $argument): bool;
+
+    /**
+     * Get jobs matching the search
+     *
+     * @param IJob|class-string<IJob>|null $job
+     * @return array<IJob>
+     * @since 25.0.0
+     * @deprecated 26.0.0 Use getJobsIterator instead to avoid duplicated job objects
+     */
+    public function getJobs(IJob|string|null $job, ?int $limit, int $offset): array;
+
+    /**
+     * Get jobs matching the search
+     *
+     * @param IJob|class-string<IJob>|null $job
+     * @return iterable<IJob>
+     * @since 26.0.0
+     */
+    public function getJobsIterator(IJob|string|null $job, ?int $limit, int $offset): iterable;
+
+    /**
+     * Get the next job in the list
+     *
+     * @param bool $onlyTimeSensitive Whether we get only time sensitive jobs or not
+     * @param class-string<IJob>[]|null $jobClasses List of job classes to restrict which next job we get
+     * @return ?IJob the next job to run. Beware that this object may be a singleton and may be modified by the next call to buildJob.
+     * @since 7.0.0 - In 24.0.0 parameter $onlyTimeSensitive got added; In 30.0.0 parameter $jobClasses got added
+     */
+    public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = null): ?IJob;
+
+    /**
+     * @since 7.0.0
+     * @since 33.0.0 Parameter $id changed from int to string
+     */
+    public function getById(string $id): ?IJob;
+
+    /**
+     * @since 23.0.0
+     * @since 33.0.0 Parameter $id changed from int to string
+     */
+    public function getDetailsById(string $id): ?array;
+
+    /**
+     * set the job that was last ran to the current time
+     *
+     * @since 7.0.0
+     */
+    public function setLastJob(IJob $job): void;
+
+    /**
+     * Remove the reservation for a job
+     *
+     * @since 9.1.0
+     */
+    public function unlockJob(IJob $job): void;
+
+    /**
+     * set the lastRun of $job to now
+     *
+     * @since 7.0.0
+     */
+    public function setLastRun(IJob $job): void;
+
+    /**
+     * set the run duration of $job
+     *
+     * @since 12.0.0
+     */
+    public function setExecutionTime(IJob $job, int $timeTaken): void;
+
+    /**
+     * Reset the $job so it executes on the next trigger
+     *
+     * @since 23.0.0
+     */
+    public function resetBackgroundJob(IJob $job): void;
+
+    /**
+     * Checks whether a job of the passed class was reserved to run
+     * in the last 6h
+     *
+     * @param class-string<IJob>|null $className
+     * @return bool
+     * @since 27.0.0
+     */
+    public function hasReservedJob(?string $className): bool;
+
+    /**
+     * Returns a count of jobs per Job class
+     *
+     * @return list<array{class:class-string<IJob>, count:int}>
+     * @since 30.0.0
+     */
+    public function countByClass(): array;
 }

lib/private/BackgroundJob/JobList.php

Indentation +410 added lines, -410 removed lines

@@ -26,414 +26,414 @@
 use function strlen;
 
 class JobList implements IJobList {
-	/** @var array<string, string> */
-	protected array $alreadyVisitedParallelBlocked = [];
-
-	public function __construct(
-		protected readonly IDBConnection $connection,
-		protected readonly IConfig $config,
-		protected readonly ITimeFactory $timeFactory,
-		protected readonly LoggerInterface $logger,
-		protected readonly IGenerator $generator,
-	) {
-	}
-
-	#[Override]
-	public function add(IJob|string $job, mixed $argument = null, ?int $firstCheck = null): void {
-		if ($firstCheck === null) {
-			$firstCheck = $this->timeFactory->getTime();
-		}
-
-		$class = ($job instanceof IJob) ? get_class($job) : $job;
-
-		$argumentJson = json_encode($argument);
-		if (strlen($argumentJson) > 4000) {
-			throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		if (!$this->has($job, $argument)) {
-			$query->insert('jobs')
-				->values([
-					'id' => $query->createNamedParameter($this->generator->nextId(), IQueryBuilder::PARAM_INT),
-					'class' => $query->createNamedParameter($class),
-					'argument' => $query->createNamedParameter($argumentJson),
-					'argument_hash' => $query->createNamedParameter(hash('sha256', $argumentJson)),
-					'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
-					'last_checked' => $query->createNamedParameter($firstCheck, IQueryBuilder::PARAM_INT),
-				]);
-		} else {
-			$query->update('jobs')
-				->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
-				->set('last_checked', $query->createNamedParameter($firstCheck, IQueryBuilder::PARAM_INT))
-				->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-				->where($query->expr()->eq('class', $query->createNamedParameter($class)))
-				->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argumentJson))));
-		}
-		$query->executeStatement();
-	}
-
-	public function scheduleAfter(string $job, int $runAfter, mixed $argument = null): void {
-		$this->add($job, $argument, $runAfter);
-	}
-
-	#[Override]
-	public function remove(IJob|string $job, mixed $argument = null): void {
-		$class = ($job instanceof IJob) ? get_class($job) : $job;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)));
-		if (!is_null($argument)) {
-			$argumentJson = json_encode($argument);
-			$query->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argumentJson))));
-		}
-
-		// Add galera safe delete chunking if using mysql
-		// Stops us hitting wsrep_max_ws_rows when large row counts are deleted
-		if ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_MYSQL) {
-			// Then use chunked delete
-			$max = IQueryBuilder::MAX_ROW_DELETION;
-
-			$query->setMaxResults($max);
-
-			do {
-				$deleted = $query->executeStatement();
-			} while ($deleted === $max);
-		} else {
-			// Dont use chunked delete - let the DB handle the large row count natively
-			$query->executeStatement();
-		}
-	}
-
-	#[Override]
-	public function removeById(string $id): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	#[Override]
-	public function has(IJob|string $job, mixed $argument): bool {
-		$class = ($job instanceof IJob) ? get_class($job) : $job;
-		$argument = json_encode($argument);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id')
-			->from('jobs')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)))
-			->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argument))))
-			->setMaxResults(1);
-
-		$result = $query->executeQuery();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (bool)$row;
-	}
-
-	#[Override]
-	public function getJobs(IJob|string|null $job, ?int $limit, int $offset): array {
-		$iterable = $this->getJobsIterator($job, $limit, $offset);
-		return (is_array($iterable))
-			? $iterable
-			: iterator_to_array($iterable);
-	}
-
-	#[Override]
-	public function getJobsIterator(IJob|string|null $job, ?int $limit, int $offset): iterable {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->setMaxResults($limit)
-			->setFirstResult($offset);
-
-		if ($job !== null) {
-			$class = ($job instanceof IJob) ? get_class($job) : $job;
-			$query->where($query->expr()->eq('class', $query->createNamedParameter($class)));
-		}
-
-		$result = $query->executeQuery();
-
-		while ($row = $result->fetch()) {
-			$job = $this->buildJob($row);
-			if ($job) {
-				yield $job;
-			}
-		}
-		$result->closeCursor();
-	}
-
-	#[Override]
-	public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = null): ?IJob {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->lte('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 12 * 3600, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->lte('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT)))
-			->orderBy('last_checked', 'ASC')
-			->setMaxResults(1);
-
-		if ($onlyTimeSensitive) {
-			$query->andWhere($query->expr()->eq('time_sensitive', $query->createNamedParameter(IJob::TIME_SENSITIVE, IQueryBuilder::PARAM_INT)));
-		}
-
-		if (!empty($jobClasses)) {
-			$orClasses = [];
-			foreach ($jobClasses as $jobClass) {
-				$orClasses[] = $query->expr()->eq('class', $query->createNamedParameter($jobClass, IQueryBuilder::PARAM_STR));
-			}
-			$query->andWhere($query->expr()->orX(...$orClasses));
-		}
-
-		$result = $query->executeQuery();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			$job = $this->buildJob($row);
-
-			if ($job instanceof IParallelAwareJob && !$job->getAllowParallelRuns() && $this->hasReservedJob(get_class($job))) {
-				if (!isset($this->alreadyVisitedParallelBlocked[get_class($job)])) {
-					$this->alreadyVisitedParallelBlocked[get_class($job)] = $job->getId();
-				} elseif ($this->alreadyVisitedParallelBlocked[get_class($job)] === $job->getId()) {
-					$this->logger->info('Skipped through all jobs and revisited a IParallelAwareJob blocked job again, giving up.', ['app' => 'cron']);
-					return null;
-				}
-				$this->logger->info('Skipping ' . get_class($job) . ' job with ID ' . $job->getId() . ' because another job with the same class is already running', ['app' => 'cron']);
-
-				$update = $this->connection->getQueryBuilder();
-				$update->update('jobs')
-					->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime() + 1))
-					->where($update->expr()->eq('id', $update->createParameter('jobid')));
-				$update->setParameter('jobid', $row['id']);
-				$update->executeStatement();
-
-				return $this->getNext($onlyTimeSensitive, $jobClasses);
-			}
-
-			if ($job !== null && isset($this->alreadyVisitedParallelBlocked[get_class($job)])) {
-				unset($this->alreadyVisitedParallelBlocked[get_class($job)]);
-			}
-
-			if ($job instanceof \OCP\BackgroundJob\TimedJob) {
-				$now = $this->timeFactory->getTime();
-				$nextPossibleRun = $job->getLastRun() + $job->getInterval();
-				if ($now < $nextPossibleRun) {
-					// This job is not ready for execution yet. Set timestamps to the future to avoid
-					// re-checking with every cron run.
-					// To avoid bugs that lead to jobs never executing again, the future timestamp is
-					// capped at two days.
-					$nextCheck = min($nextPossibleRun, $now + 48 * 3600);
-					$updateTimedJob = $this->connection->getQueryBuilder();
-					$updateTimedJob->update('jobs')
-						->set('last_checked', $updateTimedJob->createNamedParameter($nextCheck, IQueryBuilder::PARAM_INT))
-						->where($updateTimedJob->expr()->eq('id', $updateTimedJob->createParameter('jobid')));
-					$updateTimedJob->setParameter('jobid', $row['id']);
-					$updateTimedJob->executeStatement();
-
-					return $this->getNext($onlyTimeSensitive, $jobClasses);
-				}
-			}
-
-			$update = $this->connection->getQueryBuilder();
-			$update->update('jobs')
-				->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
-				->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
-				->where($update->expr()->eq('id', $update->createParameter('jobid')))
-				->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
-				->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
-			$update->setParameter('jobid', $row['id']);
-			$update->setParameter('reserved_at', $row['reserved_at']);
-			$update->setParameter('last_checked', $row['last_checked']);
-			$count = $update->executeStatement();
-
-			if ($count === 0) {
-				// Background job already executed elsewhere, try again.
-				return $this->getNext($onlyTimeSensitive, $jobClasses);
-			}
-
-			if ($job === null) {
-				// set the last_checked to 12h in the future to not check failing jobs all over again
-				$reset = $this->connection->getQueryBuilder();
-				$reset->update('jobs')
-					->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
-					->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
-					->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
-				$reset->executeStatement();
-
-				// Background job from disabled app, try again.
-				return $this->getNext($onlyTimeSensitive, $jobClasses);
-			}
-
-			return $job;
-		} else {
-			return null;
-		}
-	}
-
-	#[Override]
-	public function getById(string $id): ?IJob {
-		$row = $this->getDetailsById($id);
-
-		if ($row) {
-			return $this->buildJob($row);
-		}
-
-		return null;
-	}
-
-	#[Override]
-	public function getDetailsById(string $id): ?array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$result = $query->executeQuery();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			return $row;
-		}
-
-		return null;
-	}
-
-	/**
-	 * get the job object from a row in the db
-	 *
-	 * @param array{class:class-string<IJob>, id:mixed, last_run:mixed, argument:string} $row
-	 * @return ?IJob the next job to run. Beware that this object may be a singleton and may be modified by the next call to buildJob.
-	 */
-	private function buildJob(array $row): ?IJob {
-		try {
-			try {
-				// Try to load the job as a service
-				/** @var IJob $job */
-				$job = \OCP\Server::get($row['class']);
-			} catch (ContainerExceptionInterface $e) {
-				if (class_exists($row['class'])) {
-					$class = $row['class'];
-					$job = new $class();
-				} else {
-					$this->logger->warning('failed to create instance of background job: ' . $row['class'], ['app' => 'cron', 'exception' => $e]);
-					// Remove job from disabled app or old version of an app
-					$this->removeById($row['id']);
-					return null;
-				}
-			}
-
-			if (!($job instanceof IJob)) {
-				// This most likely means an invalid job was enqueued. We can ignore it.
-				return null;
-			}
-			$job->setId($row['id']);
-			$job->setLastRun((int)$row['last_run']);
-			$job->setArgument(json_decode($row['argument'], true));
-			return $job;
-		} catch (AutoloadNotAllowedException $e) {
-			// job is from a disabled app, ignore
-			return null;
-		}
-	}
-
-	/**
-	 * set the job that was last ran
-	 */
-	public function setLastJob(IJob $job): void {
-		$this->unlockJob($job);
-		$this->config->setAppValue('backgroundjob', 'lastjob', $job->getId());
-	}
-
-	#[Override]
-	public function unlockJob(IJob $job): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	#[Override]
-	public function setLastRun(IJob $job): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-
-		if ($job instanceof \OCP\BackgroundJob\TimedJob
-			&& !$job->isTimeSensitive()) {
-			$query->set('time_sensitive', $query->createNamedParameter(IJob::TIME_INSENSITIVE));
-		}
-
-		$query->executeStatement();
-	}
-
-	#[Override]
-	public function setExecutionTime(IJob $job, $timeTaken): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
-			->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	#[Override]
-	public function resetBackgroundJob(IJob $job): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId()), IQueryBuilder::PARAM_INT));
-		$query->executeStatement();
-	}
-
-	#[Override]
-	public function hasReservedJob(?string $className = null): bool {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->gt('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 6 * 3600, IQueryBuilder::PARAM_INT)))
-			->setMaxResults(1);
-
-		if ($className !== null) {
-			$query->andWhere($query->expr()->eq('class', $query->createNamedParameter($className)));
-		}
-
-		try {
-			$result = $query->executeQuery();
-			$hasReservedJobs = $result->fetch() !== false;
-			$result->closeCursor();
-			return $hasReservedJobs;
-		} catch (Exception $e) {
-			$this->logger->debug('Querying reserved jobs failed', ['exception' => $e]);
-			return false;
-		}
-	}
-
-	#[Override]
-	public function countByClass(): array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('class')
-			->selectAlias($query->func()->count('id'), 'count')
-			->from('jobs')
-			->orderBy('count')
-			->groupBy('class');
-
-		$result = $query->executeQuery();
-
-		$jobs = [];
-
-		while (($row = $result->fetch()) !== false) {
-			/**
-			 * @var array{count:int, class:class-string<IJob>} $row
-			 */
-			$jobs[] = $row;
-		}
-
-		return $jobs;
-	}
+    /** @var array<string, string> */
+    protected array $alreadyVisitedParallelBlocked = [];
+
+    public function __construct(
+        protected readonly IDBConnection $connection,
+        protected readonly IConfig $config,
+        protected readonly ITimeFactory $timeFactory,
+        protected readonly LoggerInterface $logger,
+        protected readonly IGenerator $generator,
+    ) {
+    }
+
+    #[Override]
+    public function add(IJob|string $job, mixed $argument = null, ?int $firstCheck = null): void {
+        if ($firstCheck === null) {
+            $firstCheck = $this->timeFactory->getTime();
+        }
+
+        $class = ($job instanceof IJob) ? get_class($job) : $job;
+
+        $argumentJson = json_encode($argument);
+        if (strlen($argumentJson) > 4000) {
+            throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        if (!$this->has($job, $argument)) {
+            $query->insert('jobs')
+                ->values([
+                    'id' => $query->createNamedParameter($this->generator->nextId(), IQueryBuilder::PARAM_INT),
+                    'class' => $query->createNamedParameter($class),
+                    'argument' => $query->createNamedParameter($argumentJson),
+                    'argument_hash' => $query->createNamedParameter(hash('sha256', $argumentJson)),
+                    'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
+                    'last_checked' => $query->createNamedParameter($firstCheck, IQueryBuilder::PARAM_INT),
+                ]);
+        } else {
+            $query->update('jobs')
+                ->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
+                ->set('last_checked', $query->createNamedParameter($firstCheck, IQueryBuilder::PARAM_INT))
+                ->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+                ->where($query->expr()->eq('class', $query->createNamedParameter($class)))
+                ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argumentJson))));
+        }
+        $query->executeStatement();
+    }
+
+    public function scheduleAfter(string $job, int $runAfter, mixed $argument = null): void {
+        $this->add($job, $argument, $runAfter);
+    }
+
+    #[Override]
+    public function remove(IJob|string $job, mixed $argument = null): void {
+        $class = ($job instanceof IJob) ? get_class($job) : $job;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)));
+        if (!is_null($argument)) {
+            $argumentJson = json_encode($argument);
+            $query->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argumentJson))));
+        }
+
+        // Add galera safe delete chunking if using mysql
+        // Stops us hitting wsrep_max_ws_rows when large row counts are deleted
+        if ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_MYSQL) {
+            // Then use chunked delete
+            $max = IQueryBuilder::MAX_ROW_DELETION;
+
+            $query->setMaxResults($max);
+
+            do {
+                $deleted = $query->executeStatement();
+            } while ($deleted === $max);
+        } else {
+            // Dont use chunked delete - let the DB handle the large row count natively
+            $query->executeStatement();
+        }
+    }
+
+    #[Override]
+    public function removeById(string $id): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    #[Override]
+    public function has(IJob|string $job, mixed $argument): bool {
+        $class = ($job instanceof IJob) ? get_class($job) : $job;
+        $argument = json_encode($argument);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id')
+            ->from('jobs')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)))
+            ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argument))))
+            ->setMaxResults(1);
+
+        $result = $query->executeQuery();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        return (bool)$row;
+    }
+
+    #[Override]
+    public function getJobs(IJob|string|null $job, ?int $limit, int $offset): array {
+        $iterable = $this->getJobsIterator($job, $limit, $offset);
+        return (is_array($iterable))
+            ? $iterable
+            : iterator_to_array($iterable);
+    }
+
+    #[Override]
+    public function getJobsIterator(IJob|string|null $job, ?int $limit, int $offset): iterable {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->setMaxResults($limit)
+            ->setFirstResult($offset);
+
+        if ($job !== null) {
+            $class = ($job instanceof IJob) ? get_class($job) : $job;
+            $query->where($query->expr()->eq('class', $query->createNamedParameter($class)));
+        }
+
+        $result = $query->executeQuery();
+
+        while ($row = $result->fetch()) {
+            $job = $this->buildJob($row);
+            if ($job) {
+                yield $job;
+            }
+        }
+        $result->closeCursor();
+    }
+
+    #[Override]
+    public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = null): ?IJob {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->lte('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 12 * 3600, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->lte('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT)))
+            ->orderBy('last_checked', 'ASC')
+            ->setMaxResults(1);
+
+        if ($onlyTimeSensitive) {
+            $query->andWhere($query->expr()->eq('time_sensitive', $query->createNamedParameter(IJob::TIME_SENSITIVE, IQueryBuilder::PARAM_INT)));
+        }
+
+        if (!empty($jobClasses)) {
+            $orClasses = [];
+            foreach ($jobClasses as $jobClass) {
+                $orClasses[] = $query->expr()->eq('class', $query->createNamedParameter($jobClass, IQueryBuilder::PARAM_STR));
+            }
+            $query->andWhere($query->expr()->orX(...$orClasses));
+        }
+
+        $result = $query->executeQuery();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            $job = $this->buildJob($row);
+
+            if ($job instanceof IParallelAwareJob && !$job->getAllowParallelRuns() && $this->hasReservedJob(get_class($job))) {
+                if (!isset($this->alreadyVisitedParallelBlocked[get_class($job)])) {
+                    $this->alreadyVisitedParallelBlocked[get_class($job)] = $job->getId();
+                } elseif ($this->alreadyVisitedParallelBlocked[get_class($job)] === $job->getId()) {
+                    $this->logger->info('Skipped through all jobs and revisited a IParallelAwareJob blocked job again, giving up.', ['app' => 'cron']);
+                    return null;
+                }
+                $this->logger->info('Skipping ' . get_class($job) . ' job with ID ' . $job->getId() . ' because another job with the same class is already running', ['app' => 'cron']);
+
+                $update = $this->connection->getQueryBuilder();
+                $update->update('jobs')
+                    ->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime() + 1))
+                    ->where($update->expr()->eq('id', $update->createParameter('jobid')));
+                $update->setParameter('jobid', $row['id']);
+                $update->executeStatement();
+
+                return $this->getNext($onlyTimeSensitive, $jobClasses);
+            }
+
+            if ($job !== null && isset($this->alreadyVisitedParallelBlocked[get_class($job)])) {
+                unset($this->alreadyVisitedParallelBlocked[get_class($job)]);
+            }
+
+            if ($job instanceof \OCP\BackgroundJob\TimedJob) {
+                $now = $this->timeFactory->getTime();
+                $nextPossibleRun = $job->getLastRun() + $job->getInterval();
+                if ($now < $nextPossibleRun) {
+                    // This job is not ready for execution yet. Set timestamps to the future to avoid
+                    // re-checking with every cron run.
+                    // To avoid bugs that lead to jobs never executing again, the future timestamp is
+                    // capped at two days.
+                    $nextCheck = min($nextPossibleRun, $now + 48 * 3600);
+                    $updateTimedJob = $this->connection->getQueryBuilder();
+                    $updateTimedJob->update('jobs')
+                        ->set('last_checked', $updateTimedJob->createNamedParameter($nextCheck, IQueryBuilder::PARAM_INT))
+                        ->where($updateTimedJob->expr()->eq('id', $updateTimedJob->createParameter('jobid')));
+                    $updateTimedJob->setParameter('jobid', $row['id']);
+                    $updateTimedJob->executeStatement();
+
+                    return $this->getNext($onlyTimeSensitive, $jobClasses);
+                }
+            }
+
+            $update = $this->connection->getQueryBuilder();
+            $update->update('jobs')
+                ->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
+                ->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
+                ->where($update->expr()->eq('id', $update->createParameter('jobid')))
+                ->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
+                ->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
+            $update->setParameter('jobid', $row['id']);
+            $update->setParameter('reserved_at', $row['reserved_at']);
+            $update->setParameter('last_checked', $row['last_checked']);
+            $count = $update->executeStatement();
+
+            if ($count === 0) {
+                // Background job already executed elsewhere, try again.
+                return $this->getNext($onlyTimeSensitive, $jobClasses);
+            }
+
+            if ($job === null) {
+                // set the last_checked to 12h in the future to not check failing jobs all over again
+                $reset = $this->connection->getQueryBuilder();
+                $reset->update('jobs')
+                    ->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
+                    ->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
+                    ->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
+                $reset->executeStatement();
+
+                // Background job from disabled app, try again.
+                return $this->getNext($onlyTimeSensitive, $jobClasses);
+            }
+
+            return $job;
+        } else {
+            return null;
+        }
+    }
+
+    #[Override]
+    public function getById(string $id): ?IJob {
+        $row = $this->getDetailsById($id);
+
+        if ($row) {
+            return $this->buildJob($row);
+        }
+
+        return null;
+    }
+
+    #[Override]
+    public function getDetailsById(string $id): ?array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $result = $query->executeQuery();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            return $row;
+        }
+
+        return null;
+    }
+
+    /**
+     * get the job object from a row in the db
+     *
+     * @param array{class:class-string<IJob>, id:mixed, last_run:mixed, argument:string} $row
+     * @return ?IJob the next job to run. Beware that this object may be a singleton and may be modified by the next call to buildJob.
+     */
+    private function buildJob(array $row): ?IJob {
+        try {
+            try {
+                // Try to load the job as a service
+                /** @var IJob $job */
+                $job = \OCP\Server::get($row['class']);
+            } catch (ContainerExceptionInterface $e) {
+                if (class_exists($row['class'])) {
+                    $class = $row['class'];
+                    $job = new $class();
+                } else {
+                    $this->logger->warning('failed to create instance of background job: ' . $row['class'], ['app' => 'cron', 'exception' => $e]);
+                    // Remove job from disabled app or old version of an app
+                    $this->removeById($row['id']);
+                    return null;
+                }
+            }
+
+            if (!($job instanceof IJob)) {
+                // This most likely means an invalid job was enqueued. We can ignore it.
+                return null;
+            }
+            $job->setId($row['id']);
+            $job->setLastRun((int)$row['last_run']);
+            $job->setArgument(json_decode($row['argument'], true));
+            return $job;
+        } catch (AutoloadNotAllowedException $e) {
+            // job is from a disabled app, ignore
+            return null;
+        }
+    }
+
+    /**
+     * set the job that was last ran
+     */
+    public function setLastJob(IJob $job): void {
+        $this->unlockJob($job);
+        $this->config->setAppValue('backgroundjob', 'lastjob', $job->getId());
+    }
+
+    #[Override]
+    public function unlockJob(IJob $job): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    #[Override]
+    public function setLastRun(IJob $job): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+
+        if ($job instanceof \OCP\BackgroundJob\TimedJob
+            && !$job->isTimeSensitive()) {
+            $query->set('time_sensitive', $query->createNamedParameter(IJob::TIME_INSENSITIVE));
+        }
+
+        $query->executeStatement();
+    }
+
+    #[Override]
+    public function setExecutionTime(IJob $job, $timeTaken): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
+            ->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    #[Override]
+    public function resetBackgroundJob(IJob $job): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+            ->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId()), IQueryBuilder::PARAM_INT));
+        $query->executeStatement();
+    }
+
+    #[Override]
+    public function hasReservedJob(?string $className = null): bool {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->gt('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 6 * 3600, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults(1);
+
+        if ($className !== null) {
+            $query->andWhere($query->expr()->eq('class', $query->createNamedParameter($className)));
+        }
+
+        try {
+            $result = $query->executeQuery();
+            $hasReservedJobs = $result->fetch() !== false;
+            $result->closeCursor();
+            return $hasReservedJobs;
+        } catch (Exception $e) {
+            $this->logger->debug('Querying reserved jobs failed', ['exception' => $e]);
+            return false;
+        }
+    }
+
+    #[Override]
+    public function countByClass(): array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('class')
+            ->selectAlias($query->func()->count('id'), 'count')
+            ->from('jobs')
+            ->orderBy('count')
+            ->groupBy('class');
+
+        $result = $query->executeQuery();
+
+        $jobs = [];
+
+        while (($row = $result->fetch()) !== false) {
+            /**
+             * @var array{count:int, class:class-string<IJob>} $row
+             */
+            $jobs[] = $row;
+        }
+
+        return $jobs;
+    }
 }

apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php

Indentation +74 added lines, -74 removed lines

@@ -19,78 +19,78 @@
 use Test\TestCase;
 
 class RefreshWebcalJobTest extends TestCase {
-	private RefreshWebcalService&MockObject $refreshWebcalService;
-	private IConfig&MockObject $config;
-	private LoggerInterface $logger;
-	private ITimeFactory&MockObject $timeFactory;
-	private IJobList&MockObject $jobList;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->refreshWebcalService = $this->createMock(RefreshWebcalService::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-
-		$this->jobList = $this->createMock(IJobList::class);
-	}
-
-	/**
-	 *
-	 * @param int $lastRun
-	 * @param int $time
-	 * @param bool $process
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('runDataProvider')]
-	public function testRun(int $lastRun, int $time, bool $process): void {
-		$backgroundJob = new RefreshWebcalJob($this->refreshWebcalService, $this->config, $this->logger, $this->timeFactory);
-		$backgroundJob->setId('42');
-
-		$backgroundJob->setArgument([
-			'principaluri' => 'principals/users/testuser',
-			'uri' => 'sub123',
-		]);
-		$backgroundJob->setLastRun($lastRun);
-
-		$this->refreshWebcalService->expects($this->once())
-			->method('getSubscription')
-			->with('principals/users/testuser', 'sub123')
-			->willReturn([
-				'id' => '99',
-				'uri' => 'sub456',
-				'{http://apple.com/ns/ical/}refreshrate' => 'P1D',
-				'{http://calendarserver.org/ns/}subscribed-strip-todos' => '1',
-				'{http://calendarserver.org/ns/}subscribed-strip-alarms' => '1',
-				'{http://calendarserver.org/ns/}subscribed-strip-attachments' => '1',
-				'source' => 'webcal://foo.bar/bla'
-			]);
-
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->with('dav', 'calendarSubscriptionRefreshRate', 'P1D')
-			->willReturn('P1W');
-
-		$this->timeFactory->method('getTime')
-			->willReturn($time);
-
-		if ($process) {
-			$this->refreshWebcalService->expects($this->once())
-				->method('refreshSubscription')
-				->with('principals/users/testuser', 'sub123');
-		} else {
-			$this->refreshWebcalService->expects($this->never())
-				->method('refreshSubscription')
-				->with('principals/users/testuser', 'sub123');
-		}
-
-		$backgroundJob->start($this->jobList);
-	}
-
-	public static function runDataProvider():array {
-		return [
-			[0, 100000, true],
-			[100000, 100000, false]
-		];
-	}
+    private RefreshWebcalService&MockObject $refreshWebcalService;
+    private IConfig&MockObject $config;
+    private LoggerInterface $logger;
+    private ITimeFactory&MockObject $timeFactory;
+    private IJobList&MockObject $jobList;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->refreshWebcalService = $this->createMock(RefreshWebcalService::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+
+        $this->jobList = $this->createMock(IJobList::class);
+    }
+
+    /**
+     *
+     * @param int $lastRun
+     * @param int $time
+     * @param bool $process
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('runDataProvider')]
+    public function testRun(int $lastRun, int $time, bool $process): void {
+        $backgroundJob = new RefreshWebcalJob($this->refreshWebcalService, $this->config, $this->logger, $this->timeFactory);
+        $backgroundJob->setId('42');
+
+        $backgroundJob->setArgument([
+            'principaluri' => 'principals/users/testuser',
+            'uri' => 'sub123',
+        ]);
+        $backgroundJob->setLastRun($lastRun);
+
+        $this->refreshWebcalService->expects($this->once())
+            ->method('getSubscription')
+            ->with('principals/users/testuser', 'sub123')
+            ->willReturn([
+                'id' => '99',
+                'uri' => 'sub456',
+                '{http://apple.com/ns/ical/}refreshrate' => 'P1D',
+                '{http://calendarserver.org/ns/}subscribed-strip-todos' => '1',
+                '{http://calendarserver.org/ns/}subscribed-strip-alarms' => '1',
+                '{http://calendarserver.org/ns/}subscribed-strip-attachments' => '1',
+                'source' => 'webcal://foo.bar/bla'
+            ]);
+
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->with('dav', 'calendarSubscriptionRefreshRate', 'P1D')
+            ->willReturn('P1W');
+
+        $this->timeFactory->method('getTime')
+            ->willReturn($time);
+
+        if ($process) {
+            $this->refreshWebcalService->expects($this->once())
+                ->method('refreshSubscription')
+                ->with('principals/users/testuser', 'sub123');
+        } else {
+            $this->refreshWebcalService->expects($this->never())
+                ->method('refreshSubscription')
+                ->with('principals/users/testuser', 'sub123');
+        }
+
+        $backgroundJob->start($this->jobList);
+    }
+
+    public static function runDataProvider():array {
+        return [
+            [0, 100000, true],
+            [100000, 100000, false]
+        ];
+    }
 }

tests/lib/BackgroundJob/DummyJobList.php

Indentation +156 added lines, -156 removed lines

@@ -21,160 +21,160 @@
  * in memory job list for testing purposes
  */
 class DummyJobList extends JobList {
-	/**
-	 * @var IJob[]
-	 */
-	private array $jobs = [];
-
-	/**
-	 * @var bool[]
-	 */
-	private array $reserved = [];
-
-	private int $last = 0;
-
-	public function __construct() {
-	}
-
-	/**
-	 * @param IJob|class-string<IJob> $job
-	 * @param mixed $argument
-	 */
-	public function add($job, $argument = null, ?int $firstCheck = null): void {
-		if (is_string($job)) {
-			/** @var IJob $job */
-			$job = Server::get($job);
-		}
-		$job->setArgument($argument);
-		$job->setId(Server::get(IGenerator::class)->nextId());
-		if (!$this->has($job, null)) {
-			$this->jobs[] = $job;
-		}
-	}
-
-	public function scheduleAfter(string $job, int $runAfter, $argument = null): void {
-		$this->add($job, $argument, $runAfter);
-	}
-
-	/**
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 */
-	public function remove($job, $argument = null): void {
-		foreach ($this->jobs as $index => $listJob) {
-			if (get_class($job) === get_class($listJob) && $job->getArgument() == $listJob->getArgument()) {
-				unset($this->jobs[$index]);
-				return;
-			}
-		}
-	}
-
-	public function removeById(string $id): void {
-		foreach ($this->jobs as $index => $listJob) {
-			if ($listJob->getId() === $id) {
-				unset($this->jobs[$index]);
-				return;
-			}
-		}
-	}
-
-	/**
-	 * check if a job is in the list
-	 *
-	 * @param $job
-	 * @param mixed $argument
-	 * @return bool
-	 */
-	public function has($job, $argument): bool {
-		return array_search($job, $this->jobs) !== false;
-	}
-
-	/**
-	 * get all jobs in the list
-	 *
-	 * @return IJob[]
-	 */
-	public function getAll(): array {
-		return $this->jobs;
-	}
-
-	public function getJobsIterator($job, ?int $limit, int $offset): iterable {
-		if ($job instanceof IJob) {
-			$jobClass = get_class($job);
-		} else {
-			$jobClass = $job;
-		}
-
-		$jobs = array_slice(
-			array_filter(
-				$this->jobs,
-				fn ($job) => ($jobClass === null) || (get_class($job) === $jobClass)
-			),
-			$offset,
-			$limit
-		);
-
-		return new ArrayIterator($jobs);
-	}
-
-	/**
-	 * get the next job in the list
-	 */
-	public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = null): ?IJob {
-		if (count($this->jobs) > 0) {
-			if ($this->last < (count($this->jobs) - 1)) {
-				$i = $this->last + 1;
-			} else {
-				$i = 0;
-			}
-			return $this->jobs[$i];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * set the job that was last ran
-	 *
-	 * @param Job $job
-	 */
-	public function setLastJob(IJob $job): void {
-		$i = array_search($job, $this->jobs);
-		if ($i !== false) {
-			$this->last = $i;
-		} else {
-			$this->last = 0;
-		}
-	}
-
-	public function getById(string $id): ?IJob {
-		foreach ($this->jobs as $job) {
-			if ($job->getId() === $id) {
-				return $job;
-			}
-		}
-		return null;
-	}
-
-	public function getDetailsById(string $id): ?array {
-		return null;
-	}
-
-	public function setLastRun(IJob $job): void {
-		$job->setLastRun(time());
-	}
-
-	public function hasReservedJob(?string $className = null): bool {
-		return isset($this->reserved[$className ?? '']) && $this->reserved[$className ?? ''];
-	}
-
-	public function setHasReservedJob(?string $className, bool $hasReserved): void {
-		$this->reserved[$className ?? ''] = $hasReserved;
-	}
-
-	public function setExecutionTime(IJob $job, $timeTaken): void {
-	}
-
-	public function resetBackgroundJob(IJob $job): void {
-	}
+    /**
+     * @var IJob[]
+     */
+    private array $jobs = [];
+
+    /**
+     * @var bool[]
+     */
+    private array $reserved = [];
+
+    private int $last = 0;
+
+    public function __construct() {
+    }
+
+    /**
+     * @param IJob|class-string<IJob> $job
+     * @param mixed $argument
+     */
+    public function add($job, $argument = null, ?int $firstCheck = null): void {
+        if (is_string($job)) {
+            /** @var IJob $job */
+            $job = Server::get($job);
+        }
+        $job->setArgument($argument);
+        $job->setId(Server::get(IGenerator::class)->nextId());
+        if (!$this->has($job, null)) {
+            $this->jobs[] = $job;
+        }
+    }
+
+    public function scheduleAfter(string $job, int $runAfter, $argument = null): void {
+        $this->add($job, $argument, $runAfter);
+    }
+
+    /**
+     * @param IJob|string $job
+     * @param mixed $argument
+     */
+    public function remove($job, $argument = null): void {
+        foreach ($this->jobs as $index => $listJob) {
+            if (get_class($job) === get_class($listJob) && $job->getArgument() == $listJob->getArgument()) {
+                unset($this->jobs[$index]);
+                return;
+            }
+        }
+    }
+
+    public function removeById(string $id): void {
+        foreach ($this->jobs as $index => $listJob) {
+            if ($listJob->getId() === $id) {
+                unset($this->jobs[$index]);
+                return;
+            }
+        }
+    }
+
+    /**
+     * check if a job is in the list
+     *
+     * @param $job
+     * @param mixed $argument
+     * @return bool
+     */
+    public function has($job, $argument): bool {
+        return array_search($job, $this->jobs) !== false;
+    }
+
+    /**
+     * get all jobs in the list
+     *
+     * @return IJob[]
+     */
+    public function getAll(): array {
+        return $this->jobs;
+    }
+
+    public function getJobsIterator($job, ?int $limit, int $offset): iterable {
+        if ($job instanceof IJob) {
+            $jobClass = get_class($job);
+        } else {
+            $jobClass = $job;
+        }
+
+        $jobs = array_slice(
+            array_filter(
+                $this->jobs,
+                fn ($job) => ($jobClass === null) || (get_class($job) === $jobClass)
+            ),
+            $offset,
+            $limit
+        );
+
+        return new ArrayIterator($jobs);
+    }
+
+    /**
+     * get the next job in the list
+     */
+    public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = null): ?IJob {
+        if (count($this->jobs) > 0) {
+            if ($this->last < (count($this->jobs) - 1)) {
+                $i = $this->last + 1;
+            } else {
+                $i = 0;
+            }
+            return $this->jobs[$i];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * set the job that was last ran
+     *
+     * @param Job $job
+     */
+    public function setLastJob(IJob $job): void {
+        $i = array_search($job, $this->jobs);
+        if ($i !== false) {
+            $this->last = $i;
+        } else {
+            $this->last = 0;
+        }
+    }
+
+    public function getById(string $id): ?IJob {
+        foreach ($this->jobs as $job) {
+            if ($job->getId() === $id) {
+                return $job;
+            }
+        }
+        return null;
+    }
+
+    public function getDetailsById(string $id): ?array {
+        return null;
+    }
+
+    public function setLastRun(IJob $job): void {
+        $job->setLastRun(time());
+    }
+
+    public function hasReservedJob(?string $className = null): bool {
+        return isset($this->reserved[$className ?? '']) && $this->reserved[$className ?? ''];
+    }
+
+    public function setHasReservedJob(?string $className, bool $hasReserved): void {
+        $this->reserved[$className ?? ''] = $hasReserved;
+    }
+
+    public function setExecutionTime(IJob $job, $timeTaken): void {
+    }
+
+    public function resetBackgroundJob(IJob $job): void {
+    }
 }

tests/lib/BackgroundJob/JobListTest.php

Indentation +271 added lines, -271 removed lines

@@ -29,290 +29,290 @@
  */
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class JobListTest extends TestCase {
-	protected JobList $instance;
-	protected IDBConnection $connection;
-	protected IConfig&MockObject $config;
-	protected ITimeFactory&MockObject $timeFactory;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = Server::get(IDBConnection::class);
-		$this->clearJobsList();
-		$this->config = $this->createMock(IConfig::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->instance = new JobList(
-			$this->connection,
-			$this->config,
-			$this->timeFactory,
-			Server::get(LoggerInterface::class),
-			Server::get(IGenerator::class),
-		);
-	}
-
-	protected function clearJobsList(): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs');
-		$query->executeStatement();
-	}
-
-	protected function getAllSorted(): array {
-		$iterator = $this->instance->getJobsIterator(null, null, 0);
-		$jobs = [];
-
-		foreach ($iterator as $job) {
-			$jobs[] = clone $job;
-		}
-
-		return $jobs;
-	}
-
-	public static function argumentProvider(): array {
-		return [
-			[null],
-			[false],
-			['foobar'],
-			[12],
-			[[
-				'asd' => 5,
-				'foo' => 'bar'
-			]]
-		];
-	}
-
-	#[DataProvider('argumentProvider')]
-	public function testAddRemove(mixed $argument): void {
-		$existingJobs = $this->getAllSorted();
-		$job = new TestJob();
-		$this->instance->add($job, $argument);
-
-		$jobs = $this->getAllSorted();
-
-		$this->assertCount(count($existingJobs) + 1, $jobs);
-		$addedJob = $jobs[count($jobs) - 1];
-		$this->assertInstanceOf('\Test\BackgroundJob\TestJob', $addedJob);
-		$this->assertEquals($argument, $addedJob->getArgument());
-
-		$this->instance->remove($job, $argument);
-
-		$jobs = $this->getAllSorted();
-		$this->assertEquals($existingJobs, $jobs);
-	}
-
-	#[DataProvider('argumentProvider')]
-	public function testRemoveDifferentArgument(mixed $argument): void {
-		$existingJobs = $this->getAllSorted();
-		$job = new TestJob();
-		$this->instance->add($job, $argument);
-
-		$jobs = $this->getAllSorted();
-		$this->instance->remove($job, 10);
-		$jobs2 = $this->getAllSorted();
-
-		$this->assertEquals($jobs, $jobs2);
-
-		$this->instance->remove($job, $argument);
-
-		$jobs = $this->getAllSorted();
-		$this->assertEquals($existingJobs, $jobs);
-	}
-
-	#[DataProvider('argumentProvider')]
-	public function testHas(mixed $argument): void {
-		$job = new TestJob();
-		$this->assertFalse($this->instance->has($job, $argument));
-		$this->instance->add($job, $argument);
-
-		$this->assertTrue($this->instance->has($job, $argument));
-
-		$this->instance->remove($job, $argument);
-
-		$this->assertFalse($this->instance->has($job, $argument));
-	}
-
-	#[DataProvider('argumentProvider')]
-	public function testHasDifferentArgument(mixed $argument): void {
-		$job = new TestJob();
-		$this->instance->add($job, $argument);
-
-		$this->assertFalse($this->instance->has($job, 10));
-	}
-
-	protected function createTempJob($class,
-		$argument,
-		int $reservedTime = 0,
-		int $lastChecked = 0,
-		int $lastRun = 0): string {
-		if ($lastChecked === 0) {
-			$lastChecked = time();
-		}
-		$id = Server::get(IGenerator::class)->nextId();
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('jobs')
-			->values([
-				'id' => $query->createNamedParameter($id, IQueryBuilder::PARAM_INT),
-				'class' => $query->createNamedParameter($class),
-				'argument' => $query->createNamedParameter($argument),
-				'last_run' => $query->createNamedParameter($lastRun, IQueryBuilder::PARAM_INT),
-				'last_checked' => $query->createNamedParameter($lastChecked, IQueryBuilder::PARAM_INT),
-				'reserved_at' => $query->createNamedParameter($reservedTime, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-		return $id;
-	}
-
-	public function testGetNext(): void {
-		$job = new TestJob();
-		$this->createTempJob(get_class($job), 1, 0, 12345);
-		$this->createTempJob(get_class($job), 2, 0, 12346);
-
-		$jobs = $this->getAllSorted();
-		$savedJob1 = $jobs[0];
-
-		$this->timeFactory->expects($this->atLeastOnce())
-			->method('getTime')
-			->willReturn(123456789);
-		$nextJob = $this->instance->getNext();
-
-		$this->assertEquals($savedJob1, $nextJob);
-	}
-
-	public function testGetNextSkipReserved(): void {
-		$job = new TestJob();
-		$this->createTempJob(get_class($job), 1, 123456789, 12345);
-		$this->createTempJob(get_class($job), 2, 0, 12346);
-
-		$this->timeFactory->expects($this->atLeastOnce())
-			->method('getTime')
-			->willReturn(123456789);
-		$nextJob = $this->instance->getNext();
-
-		$this->assertEquals(get_class($job), get_class($nextJob));
-		$this->assertEquals(2, $nextJob->getArgument());
-	}
-
-	public function testGetNextSkipTimed(): void {
-		$job = new TestTimedJobNew($this->timeFactory);
-		$jobId = $this->createTempJob(get_class($job), 1, 123456789, 12345, 123456789 - 5);
-		$this->timeFactory->expects(self::atLeastOnce())
-			->method('getTime')
-			->willReturn(123456789);
-
-		$nextJob = $this->instance->getNext();
-
-		self::assertNull($nextJob);
-		$job = $this->instance->getById($jobId);
-		self::assertInstanceOf(TestTimedJobNew::class, $job);
-		self::assertEquals(123456789 - 5, $job->getLastRun());
-	}
-
-	public function testGetNextSkipNonExisting(): void {
-		$job = new TestJob();
-		$this->createTempJob('\OC\Non\Existing\Class', 1, 0, 12345);
-		$this->createTempJob(get_class($job), 2, 0, 12346);
-
-		$this->timeFactory->expects($this->atLeastOnce())
-			->method('getTime')
-			->willReturn(123456789);
-		$nextJob = $this->instance->getNext();
-
-		$this->assertEquals(get_class($job), get_class($nextJob));
-		$this->assertEquals(2, $nextJob->getArgument());
-	}
-
-	/**
-	 * @param $argument
-	 */
-	#[DataProvider('argumentProvider')]
-	public function testGetById($argument): void {
-		$job = new TestJob();
-		$this->instance->add($job, $argument);
-
-		$jobs = $this->getAllSorted();
-
-		$addedJob = $jobs[count($jobs) - 1];
-
-		$this->assertEquals($addedJob, $this->instance->getById($addedJob->getId()));
-	}
-
-	public function testSetLastRun(): void {
-		$job = new TestJob();
-		$this->instance->add($job);
-
-		$jobs = $this->getAllSorted();
-
-		$addedJob = $jobs[count($jobs) - 1];
-
-		$timeStart = time();
-		$this->instance->setLastRun($addedJob);
-		$timeEnd = time();
-
-		$addedJob = $this->instance->getById($addedJob->getId());
-
-		$this->assertGreaterThanOrEqual($timeStart, $addedJob->getLastRun());
-		$this->assertLessThanOrEqual($timeEnd, $addedJob->getLastRun());
-	}
-
-	public function testHasReservedJobs(): void {
-		$this->clearJobsList();
+    protected JobList $instance;
+    protected IDBConnection $connection;
+    protected IConfig&MockObject $config;
+    protected ITimeFactory&MockObject $timeFactory;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = Server::get(IDBConnection::class);
+        $this->clearJobsList();
+        $this->config = $this->createMock(IConfig::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->instance = new JobList(
+            $this->connection,
+            $this->config,
+            $this->timeFactory,
+            Server::get(LoggerInterface::class),
+            Server::get(IGenerator::class),
+        );
+    }
+
+    protected function clearJobsList(): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs');
+        $query->executeStatement();
+    }
+
+    protected function getAllSorted(): array {
+        $iterator = $this->instance->getJobsIterator(null, null, 0);
+        $jobs = [];
+
+        foreach ($iterator as $job) {
+            $jobs[] = clone $job;
+        }
+
+        return $jobs;
+    }
+
+    public static function argumentProvider(): array {
+        return [
+            [null],
+            [false],
+            ['foobar'],
+            [12],
+            [[
+                'asd' => 5,
+                'foo' => 'bar'
+            ]]
+        ];
+    }
+
+    #[DataProvider('argumentProvider')]
+    public function testAddRemove(mixed $argument): void {
+        $existingJobs = $this->getAllSorted();
+        $job = new TestJob();
+        $this->instance->add($job, $argument);
+
+        $jobs = $this->getAllSorted();
+
+        $this->assertCount(count($existingJobs) + 1, $jobs);
+        $addedJob = $jobs[count($jobs) - 1];
+        $this->assertInstanceOf('\Test\BackgroundJob\TestJob', $addedJob);
+        $this->assertEquals($argument, $addedJob->getArgument());
+
+        $this->instance->remove($job, $argument);
+
+        $jobs = $this->getAllSorted();
+        $this->assertEquals($existingJobs, $jobs);
+    }
+
+    #[DataProvider('argumentProvider')]
+    public function testRemoveDifferentArgument(mixed $argument): void {
+        $existingJobs = $this->getAllSorted();
+        $job = new TestJob();
+        $this->instance->add($job, $argument);
+
+        $jobs = $this->getAllSorted();
+        $this->instance->remove($job, 10);
+        $jobs2 = $this->getAllSorted();
+
+        $this->assertEquals($jobs, $jobs2);
+
+        $this->instance->remove($job, $argument);
+
+        $jobs = $this->getAllSorted();
+        $this->assertEquals($existingJobs, $jobs);
+    }
+
+    #[DataProvider('argumentProvider')]
+    public function testHas(mixed $argument): void {
+        $job = new TestJob();
+        $this->assertFalse($this->instance->has($job, $argument));
+        $this->instance->add($job, $argument);
+
+        $this->assertTrue($this->instance->has($job, $argument));
+
+        $this->instance->remove($job, $argument);
+
+        $this->assertFalse($this->instance->has($job, $argument));
+    }
+
+    #[DataProvider('argumentProvider')]
+    public function testHasDifferentArgument(mixed $argument): void {
+        $job = new TestJob();
+        $this->instance->add($job, $argument);
+
+        $this->assertFalse($this->instance->has($job, 10));
+    }
+
+    protected function createTempJob($class,
+        $argument,
+        int $reservedTime = 0,
+        int $lastChecked = 0,
+        int $lastRun = 0): string {
+        if ($lastChecked === 0) {
+            $lastChecked = time();
+        }
+        $id = Server::get(IGenerator::class)->nextId();
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('jobs')
+            ->values([
+                'id' => $query->createNamedParameter($id, IQueryBuilder::PARAM_INT),
+                'class' => $query->createNamedParameter($class),
+                'argument' => $query->createNamedParameter($argument),
+                'last_run' => $query->createNamedParameter($lastRun, IQueryBuilder::PARAM_INT),
+                'last_checked' => $query->createNamedParameter($lastChecked, IQueryBuilder::PARAM_INT),
+                'reserved_at' => $query->createNamedParameter($reservedTime, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+        return $id;
+    }
+
+    public function testGetNext(): void {
+        $job = new TestJob();
+        $this->createTempJob(get_class($job), 1, 0, 12345);
+        $this->createTempJob(get_class($job), 2, 0, 12346);
+
+        $jobs = $this->getAllSorted();
+        $savedJob1 = $jobs[0];
+
+        $this->timeFactory->expects($this->atLeastOnce())
+            ->method('getTime')
+            ->willReturn(123456789);
+        $nextJob = $this->instance->getNext();
+
+        $this->assertEquals($savedJob1, $nextJob);
+    }
+
+    public function testGetNextSkipReserved(): void {
+        $job = new TestJob();
+        $this->createTempJob(get_class($job), 1, 123456789, 12345);
+        $this->createTempJob(get_class($job), 2, 0, 12346);
+
+        $this->timeFactory->expects($this->atLeastOnce())
+            ->method('getTime')
+            ->willReturn(123456789);
+        $nextJob = $this->instance->getNext();
+
+        $this->assertEquals(get_class($job), get_class($nextJob));
+        $this->assertEquals(2, $nextJob->getArgument());
+    }
+
+    public function testGetNextSkipTimed(): void {
+        $job = new TestTimedJobNew($this->timeFactory);
+        $jobId = $this->createTempJob(get_class($job), 1, 123456789, 12345, 123456789 - 5);
+        $this->timeFactory->expects(self::atLeastOnce())
+            ->method('getTime')
+            ->willReturn(123456789);
+
+        $nextJob = $this->instance->getNext();
+
+        self::assertNull($nextJob);
+        $job = $this->instance->getById($jobId);
+        self::assertInstanceOf(TestTimedJobNew::class, $job);
+        self::assertEquals(123456789 - 5, $job->getLastRun());
+    }
+
+    public function testGetNextSkipNonExisting(): void {
+        $job = new TestJob();
+        $this->createTempJob('\OC\Non\Existing\Class', 1, 0, 12345);
+        $this->createTempJob(get_class($job), 2, 0, 12346);
+
+        $this->timeFactory->expects($this->atLeastOnce())
+            ->method('getTime')
+            ->willReturn(123456789);
+        $nextJob = $this->instance->getNext();
+
+        $this->assertEquals(get_class($job), get_class($nextJob));
+        $this->assertEquals(2, $nextJob->getArgument());
+    }
+
+    /**
+     * @param $argument
+     */
+    #[DataProvider('argumentProvider')]
+    public function testGetById($argument): void {
+        $job = new TestJob();
+        $this->instance->add($job, $argument);
+
+        $jobs = $this->getAllSorted();
+
+        $addedJob = $jobs[count($jobs) - 1];
+
+        $this->assertEquals($addedJob, $this->instance->getById($addedJob->getId()));
+    }
+
+    public function testSetLastRun(): void {
+        $job = new TestJob();
+        $this->instance->add($job);
+
+        $jobs = $this->getAllSorted();
+
+        $addedJob = $jobs[count($jobs) - 1];
+
+        $timeStart = time();
+        $this->instance->setLastRun($addedJob);
+        $timeEnd = time();
+
+        $addedJob = $this->instance->getById($addedJob->getId());
+
+        $this->assertGreaterThanOrEqual($timeStart, $addedJob->getLastRun());
+        $this->assertLessThanOrEqual($timeEnd, $addedJob->getLastRun());
+    }
+
+    public function testHasReservedJobs(): void {
+        $this->clearJobsList();
 
-		$this->timeFactory->expects($this->atLeastOnce())
-			->method('getTime')
-			->willReturn(123456789);
+        $this->timeFactory->expects($this->atLeastOnce())
+            ->method('getTime')
+            ->willReturn(123456789);
 
-		$job = new TestJob($this->timeFactory, $this, function (): void {
-		});
+        $job = new TestJob($this->timeFactory, $this, function (): void {
+        });
 
-		$job2 = new TestJob($this->timeFactory, $this, function (): void {
-		});
+        $job2 = new TestJob($this->timeFactory, $this, function (): void {
+        });
 
-		$this->instance->add($job, 1);
-		$this->instance->add($job2, 2);
+        $this->instance->add($job, 1);
+        $this->instance->add($job2, 2);
 
-		$this->assertCount(2, iterator_to_array($this->instance->getJobsIterator(null, 10, 0)));
+        $this->assertCount(2, iterator_to_array($this->instance->getJobsIterator(null, 10, 0)));
 
-		$this->assertFalse($this->instance->hasReservedJob());
-		$this->assertFalse($this->instance->hasReservedJob(TestJob::class));
+        $this->assertFalse($this->instance->hasReservedJob());
+        $this->assertFalse($this->instance->hasReservedJob(TestJob::class));
 
-		$job = $this->instance->getNext();
-		$this->assertNotNull($job);
-		$this->assertTrue($this->instance->hasReservedJob());
-		$this->assertTrue($this->instance->hasReservedJob(TestJob::class));
-		$job = $this->instance->getNext();
-		$this->assertNotNull($job);
-		$this->assertTrue($this->instance->hasReservedJob());
-		$this->assertTrue($this->instance->hasReservedJob(TestJob::class));
-	}
+        $job = $this->instance->getNext();
+        $this->assertNotNull($job);
+        $this->assertTrue($this->instance->hasReservedJob());
+        $this->assertTrue($this->instance->hasReservedJob(TestJob::class));
+        $job = $this->instance->getNext();
+        $this->assertNotNull($job);
+        $this->assertTrue($this->instance->hasReservedJob());
+        $this->assertTrue($this->instance->hasReservedJob(TestJob::class));
+    }
 
-	public function testHasReservedJobsAndParallelAwareJob(): void {
-		$this->clearJobsList();
+    public function testHasReservedJobsAndParallelAwareJob(): void {
+        $this->clearJobsList();
 
-		$this->timeFactory->expects($this->atLeastOnce())
-			->method('getTime')
-			->willReturnCallback(function () use (&$time) {
-				return time();
-			});
+        $this->timeFactory->expects($this->atLeastOnce())
+            ->method('getTime')
+            ->willReturnCallback(function () use (&$time) {
+                return time();
+            });
 
-		$job = new TestParallelAwareJob($this->timeFactory, $this, function (): void {
-		});
+        $job = new TestParallelAwareJob($this->timeFactory, $this, function (): void {
+        });
 
-		$job2 = new TestParallelAwareJob($this->timeFactory, $this, function (): void {
-		});
+        $job2 = new TestParallelAwareJob($this->timeFactory, $this, function (): void {
+        });
 
-		$this->instance->add($job, 1);
-		$this->instance->add($job2, 2);
+        $this->instance->add($job, 1);
+        $this->instance->add($job2, 2);
 
-		$this->assertCount(2, iterator_to_array($this->instance->getJobsIterator(null, 10, 0)));
+        $this->assertCount(2, iterator_to_array($this->instance->getJobsIterator(null, 10, 0)));
 
-		$this->assertFalse($this->instance->hasReservedJob());
-		$this->assertFalse($this->instance->hasReservedJob(TestParallelAwareJob::class));
+        $this->assertFalse($this->instance->hasReservedJob());
+        $this->assertFalse($this->instance->hasReservedJob(TestParallelAwareJob::class));
 
-		$job = $this->instance->getNext();
-		$this->assertNotNull($job);
-		$this->assertTrue($this->instance->hasReservedJob());
-		$this->assertTrue($this->instance->hasReservedJob(TestParallelAwareJob::class));
-		$job = $this->instance->getNext();
-		$this->assertNull($job); // Job doesn't allow parallel runs
-	}
+        $job = $this->instance->getNext();
+        $this->assertNotNull($job);
+        $this->assertTrue($this->instance->hasReservedJob());
+        $this->assertTrue($this->instance->hasReservedJob(TestParallelAwareJob::class));
+        $job = $this->instance->getNext();
+        $this->assertNull($job); // Job doesn't allow parallel runs
+    }
 }

core/Migrations/Version33000Date20251124110529.php

Indentation +11 added lines, -11 removed lines

@@ -17,17 +17,17 @@
 
 #[ModifyColumn(table: 'jobs', name: 'id', description: 'Remove auto-increment')]
 class Version33000Date20251124110529 extends SimpleMigrationStep {
-	/**
-	 * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 */
-	#[Override]
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		$schema = $schemaClosure();
+    /**
+     * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    #[Override]
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('jobs')) {
-			$schema->dropAutoincrementColumn('jobs', 'id');
-		}
+        if ($schema->hasTable('jobs')) {
+            $schema->dropAutoincrementColumn('jobs', 'id');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Command/Background/Job.php

Indentation +116 added lines, -116 removed lines

@@ -19,120 +19,120 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Job extends Command {
-	public function __construct(
-		protected IJobList $jobList,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure(): void {
-		$this
-			->setName('background-job:execute')
-			->setDescription('Execute a single background job manually')
-			->addArgument(
-				'job-id',
-				InputArgument::REQUIRED,
-				'The ID of the job in the database'
-			)
-			->addOption(
-				'force-execute',
-				null,
-				InputOption::VALUE_NONE,
-				'Force execute the background job, independent from last run and being reserved'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$jobId = (string)$input->getArgument('job-id');
-
-		$job = $this->jobList->getById($jobId);
-		if ($job === null) {
-			$output->writeln('<error>Job with ID ' . $jobId . ' could not be found in the database</error>');
-			return 1;
-		}
-
-		$this->printJobInfo($jobId, $job, $output);
-		$output->writeln('');
-
-		$lastRun = $job->getLastRun();
-		if ($input->getOption('force-execute')) {
-			$lastRun = 0;
-			$output->writeln('<comment>Forcing execution of the job</comment>');
-			$output->writeln('');
-
-			$this->jobList->resetBackgroundJob($job);
-		}
-
-		$job = $this->jobList->getById($jobId);
-		if ($job === null) {
-			$output->writeln('<error>Something went wrong when trying to retrieve Job with ID ' . $jobId . ' from database</error>');
-			return 1;
-		}
-		$job->start($this->jobList);
-		$job = $this->jobList->getById($jobId);
-
-		if (($job === null) || ($lastRun !== $job->getLastRun())) {
-			$output->writeln('<info>Job executed!</info>');
-			$output->writeln('');
-
-			if ($job instanceof TimedJob) {
-				$this->printJobInfo($jobId, $job, $output);
-			}
-		} else {
-			$output->writeln('<comment>Job was not executed because it is not due</comment>');
-			$output->writeln('Specify the <question>--force-execute</question> option to run it anyway');
-		}
-
-		return 0;
-	}
-
-	protected function printJobInfo(string $jobId, IJob $job, OutputInterface $output): void {
-		$row = $this->jobList->getDetailsById($jobId);
-
-		$lastRun = new \DateTime();
-		$lastRun->setTimestamp((int)$row['last_run']);
-		$lastChecked = new \DateTime();
-		$lastChecked->setTimestamp((int)$row['last_checked']);
-		$reservedAt = new \DateTime();
-		$reservedAt->setTimestamp((int)$row['reserved_at']);
-
-		$output->writeln('Job class:            ' . get_class($job));
-		$output->writeln('Arguments:            ' . json_encode($job->getArgument()));
-
-		$isTimedJob = $job instanceof TimedJob;
-		if ($isTimedJob) {
-			$output->writeln('Type:                 timed');
-		} elseif ($job instanceof QueuedJob) {
-			$output->writeln('Type:                 queued');
-		} else {
-			$output->writeln('Type:                 job');
-		}
-
-		$output->writeln('');
-		$output->writeln('Last checked:         ' . $lastChecked->format(\DateTimeInterface::ATOM));
-		if ((int)$row['reserved_at'] === 0) {
-			$output->writeln('Reserved at:          -');
-		} else {
-			$output->writeln('Reserved at:          <comment>' . $reservedAt->format(\DateTimeInterface::ATOM) . '</comment>');
-		}
-		$output->writeln('Last executed:        ' . $lastRun->format(\DateTimeInterface::ATOM));
-		$output->writeln('Last duration:        ' . $row['execution_duration']);
-
-		if ($isTimedJob) {
-			$reflection = new \ReflectionClass($job);
-			$intervalProperty = $reflection->getProperty('interval');
-			$intervalProperty->setAccessible(true);
-			$interval = $intervalProperty->getValue($job);
-
-			$nextRun = new \DateTime();
-			$nextRun->setTimestamp($row['last_run'] + $interval);
-
-			if ($nextRun > new \DateTime()) {
-				$output->writeln('Next execution:       <comment>' . $nextRun->format(\DateTimeInterface::ATOM) . '</comment>');
-			} else {
-				$output->writeln('Next execution:       <info>' . $nextRun->format(\DateTimeInterface::ATOM) . '</info>');
-			}
-		}
-	}
+    public function __construct(
+        protected IJobList $jobList,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('background-job:execute')
+            ->setDescription('Execute a single background job manually')
+            ->addArgument(
+                'job-id',
+                InputArgument::REQUIRED,
+                'The ID of the job in the database'
+            )
+            ->addOption(
+                'force-execute',
+                null,
+                InputOption::VALUE_NONE,
+                'Force execute the background job, independent from last run and being reserved'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $jobId = (string)$input->getArgument('job-id');
+
+        $job = $this->jobList->getById($jobId);
+        if ($job === null) {
+            $output->writeln('<error>Job with ID ' . $jobId . ' could not be found in the database</error>');
+            return 1;
+        }
+
+        $this->printJobInfo($jobId, $job, $output);
+        $output->writeln('');
+
+        $lastRun = $job->getLastRun();
+        if ($input->getOption('force-execute')) {
+            $lastRun = 0;
+            $output->writeln('<comment>Forcing execution of the job</comment>');
+            $output->writeln('');
+
+            $this->jobList->resetBackgroundJob($job);
+        }
+
+        $job = $this->jobList->getById($jobId);
+        if ($job === null) {
+            $output->writeln('<error>Something went wrong when trying to retrieve Job with ID ' . $jobId . ' from database</error>');
+            return 1;
+        }
+        $job->start($this->jobList);
+        $job = $this->jobList->getById($jobId);
+
+        if (($job === null) || ($lastRun !== $job->getLastRun())) {
+            $output->writeln('<info>Job executed!</info>');
+            $output->writeln('');
+
+            if ($job instanceof TimedJob) {
+                $this->printJobInfo($jobId, $job, $output);
+            }
+        } else {
+            $output->writeln('<comment>Job was not executed because it is not due</comment>');
+            $output->writeln('Specify the <question>--force-execute</question> option to run it anyway');
+        }
+
+        return 0;
+    }
+
+    protected function printJobInfo(string $jobId, IJob $job, OutputInterface $output): void {
+        $row = $this->jobList->getDetailsById($jobId);
+
+        $lastRun = new \DateTime();
+        $lastRun->setTimestamp((int)$row['last_run']);
+        $lastChecked = new \DateTime();
+        $lastChecked->setTimestamp((int)$row['last_checked']);
+        $reservedAt = new \DateTime();
+        $reservedAt->setTimestamp((int)$row['reserved_at']);
+
+        $output->writeln('Job class:            ' . get_class($job));
+        $output->writeln('Arguments:            ' . json_encode($job->getArgument()));
+
+        $isTimedJob = $job instanceof TimedJob;
+        if ($isTimedJob) {
+            $output->writeln('Type:                 timed');
+        } elseif ($job instanceof QueuedJob) {
+            $output->writeln('Type:                 queued');
+        } else {
+            $output->writeln('Type:                 job');
+        }
+
+        $output->writeln('');
+        $output->writeln('Last checked:         ' . $lastChecked->format(\DateTimeInterface::ATOM));
+        if ((int)$row['reserved_at'] === 0) {
+            $output->writeln('Reserved at:          -');
+        } else {
+            $output->writeln('Reserved at:          <comment>' . $reservedAt->format(\DateTimeInterface::ATOM) . '</comment>');
+        }
+        $output->writeln('Last executed:        ' . $lastRun->format(\DateTimeInterface::ATOM));
+        $output->writeln('Last duration:        ' . $row['execution_duration']);
+
+        if ($isTimedJob) {
+            $reflection = new \ReflectionClass($job);
+            $intervalProperty = $reflection->getProperty('interval');
+            $intervalProperty->setAccessible(true);
+            $interval = $intervalProperty->getValue($job);
+
+            $nextRun = new \DateTime();
+            $nextRun->setTimestamp($row['last_run'] + $interval);
+
+            if ($nextRun > new \DateTime()) {
+                $output->writeln('Next execution:       <comment>' . $nextRun->format(\DateTimeInterface::ATOM) . '</comment>');
+            } else {
+                $output->writeln('Next execution:       <info>' . $nextRun->format(\DateTimeInterface::ATOM) . '</info>');
+            }
+        }
+    }
 }