aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2024-08-19 13:40:01 +0200
committerGitHub <noreply@github.com>2024-08-19 13:40:01 +0200
commit40c91aa31e5348a92d22d93fd2881788a75626cd (patch)
treeb6dcd14a07b910326e3e7fc7eb350f1ec65e1ec8
parent551ff4955e5f5fc8ffe5427d5facef5447f7fc1b (diff)
parent0f9ea1992c64cb9cd0fd0193285e118212191726 (diff)
downloadnextcloud-server-40c91aa31e5348a92d22d93fd2881788a75626cd.tar.gz
nextcloud-server-40c91aa31e5348a92d22d93fd2881788a75626cd.zip
Merge pull request #47182 from nextcloud/orphan-cleanup-chunk-perf
perf: improve cleanup of tags/comments
-rw-r--r--apps/files/lib/BackgroundJob/DeleteOrphanedItems.php15
1 files changed, 6 insertions, 9 deletions
diff --git a/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php
index a4b2a6cf3f8..0d6a632db1a 100644
--- a/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php
+++ b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php
@@ -66,18 +66,15 @@ class DeleteOrphanedItems extends TimedJob {
$deleteQuery = $this->connection->getQueryBuilder();
$deleteQuery->delete($table)
- ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
+ ->where($deleteQuery->expr()->in($idCol, $deleteQuery->createParameter('objectid')));
$deletedInLastChunk = self::CHUNK_SIZE;
while ($deletedInLastChunk === self::CHUNK_SIZE) {
- $result = $query->execute();
- $deletedInLastChunk = 0;
- while ($row = $result->fetch()) {
- $deletedInLastChunk++;
- $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
- ->execute();
- }
- $result->closeCursor();
+ $chunk = $query->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
+ $deletedInLastChunk = count($chunk);
+
+ $deleteQuery->setParameter('objectid', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
+ $deletedEntries += $deleteQuery->executeStatement();
}
return $deletedEntries;