Skip to content

perf: Optimize deleting the list of invalid shares #60660

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

Open
CarlSchwan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf: Optimize deleting the list of invalid shares #60660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions lib/private/Repair/RepairInvalidShares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace OC\Repair;

use OCP\Constants;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
Expand Down Expand Up @@ -67,18 +68,20 @@ private function removeSharesNonExistingParent(IOutput $output): void {

$deleteQuery = $this->connection->getQueryBuilder();
$deleteQuery->delete('share')
->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
->where($deleteQuery->expr()->in('parent', $deleteQuery->createParameter('parent')));

$deletedInLastChunk = self::CHUNK_SIZE;
while ($deletedInLastChunk === self::CHUNK_SIZE) {
$deletedInLastChunk = 0;
while (true) {
$result = $query->executeQuery();

@provokateurin provokateurin Jun 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parameter isn't set on the first invocation, so this will fail, no?

@CarlSchwan CarlSchwan Jun 2, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a different query there is two $query with a limit of 1000 and $deleteQuery which then delete the results

while ($row = $result->fetch()) {
$deletedInLastChunk++;
$deletedEntries += $deleteQuery->setParameter('parent', (int)$row['parent'])
->executeStatement();
}
$parents = $result->fetchFirstColumn();
$parents = array_unique($parents);
$result->closeCursor();

if ($parents === []) {
break;
}

$deletedEntries += $deleteQuery->setParameter('parent', $parents, IQueryBuilder::PARAM_INT_ARRAY)
->executeStatement();
}

if ($deletedEntries) {
Expand Down
Loading