Skip to content

fix(jobs): Switch to executeStatement() while deleting rows #47155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Sep 4, 2024
Merged

fix(jobs): Switch to executeStatement() while deleting rows #47155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6be80a
fix(jobs): Swicth to executeStatement() while deleting rows
solracsf Aug 9, 2024
2156a92
fix: lint
solracsf Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 16 additions & 37 deletions lib/private/BackgroundJob/JobList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,20 @@
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) {
Expand Down Expand Up @@ -81,11 +74,7 @@ public function scheduleAfter(string $job, int $runAfter, $argument = null): voi
* @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')
Expand All @@ -104,11 +93,11 @@ public function remove($job, $argument = null): void {
$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();
}
}

Expand All @@ -126,11 +115,7 @@ public function removeById(int $id): void {
* @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();
Expand All @@ -149,11 +134,9 @@ public function has($job, $argument): bool {

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);
}

/**
Expand All @@ -168,11 +151,7 @@ public function getJobsIterator($job, ?int $limit, int $offset): iterable {
->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)));
}

Expand Down