upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(jobs): Swicth to executeStatement() while deleting rows

Browse source 
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
This commit is contained in:
Git'Fellow 2024-08-09 22:38:33 +02:00 committed by backportbot[bot]
parent 1a9ded4b42
commit 07a269cea4
1 changed files with 16 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
lib/private/BackgroundJob/JobList.php
View file

@ -24,27 +24,20 @@ use function md5;
use function strlen;
class JobList implements IJobList {
protected IDBConnection $connection;
protected IConfig $config;
protected ITimeFactory $timeFactory;
protected LoggerInterface $logger;
public function __construct(IDBConnection $connection, IConfig $config, ITimeFactory $timeFactory, LoggerInterface $logger) {
$this->connection = $connection;
$this->config = $config;
$this->timeFactory = $timeFactory;
$this->logger = $logger;
public function __construct(
protected IDBConnection $connection,
protected IConfig $config,
protected ITimeFactory $timeFactory,
protected LoggerInterface $logger
) {
}
public function add($job, $argument = null, ?int $firstCheck = null): void {
if ($firstCheck === null) {
$firstCheck = $this->timeFactory->getTime();
}
if ($job instanceof IJob) {
$class = get_class($job);
} else {
$class = $job;
}
$class = ($job instanceof IJob) ? get_class($job) : $job;
$argumentJson = json_encode($argument);
if (strlen($argumentJson) > 4000) {
@ -81,11 +74,7 @@ class JobList implements IJobList {
* @param mixed $argument
*/
public function remove($job, $argument = null): void {
if ($job instanceof IJob) {
$class = get_class($job);
} else {
$class = $job;
}
$class = ($job instanceof IJob) ? get_class($job) : $job;
$query = $this->connection->getQueryBuilder();
$query->delete('jobs')
@ -104,11 +93,11 @@ class JobList implements IJobList {
$query->setMaxResults($max);
do {
$deleted = $query->execute();
$deleted = $query->executeStatement();
} while ($deleted === $max);
} else {
// Dont use chunked delete - let the DB handle the large row count natively
$query->execute();
$query->executeStatement();
}
}
@ -126,11 +115,7 @@ class JobList implements IJobList {
* @param mixed $argument
*/
public function has($job, $argument): bool {
if ($job instanceof IJob) {
$class = get_class($job);
} else {
$class = $job;
}
$class = ($job instanceof IJob) ? get_class($job) : $job;
$argument = json_encode($argument);
$query = $this->connection->getQueryBuilder();
@ -149,11 +134,9 @@ class JobList implements IJobList {
public function getJobs($job, ?int $limit, int $offset): array {
$iterable = $this->getJobsIterator($job, $limit, $offset);
if (is_array($iterable)) {
return $iterable;
} else {
return iterator_to_array($iterable);
}
return (is_array($iterable))
? $iterable
: iterator_to_array($iterable);
}
/**
@ -168,11 +151,7 @@ class JobList implements IJobList {
->setFirstResult($offset);
if ($job !== null) {
if ($job instanceof IJob) {
$class = get_class($job);
} else {
$class = $job;
}
$class = ($job instanceof IJob) ? get_class($job) : $job;
$query->where($query->expr()->eq('class', $query->createNamedParameter($class)));
}