Skip to content

fix(core): handle parameter limits in files metadata deletion #62331

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
gitedmond wants to merge 1 commit into
base: master
Choose a base branch
from
+96 −17
Open

fix(core): handle parameter limits in files metadata deletion #62331

Show file tree
Hide file tree
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
27 changes: 17 additions & 10 deletions lib/private/FilesMetadata/Service/IndexRequestService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,26 @@ public function dropIndex(int $fileId, string $key = ''): void {
* @throws DbException
*/
public function dropIndexForFiles(array $fileIds, string $key = ''): void {
$chunks = array_chunk($fileIds, IQueryBuilder::MAX_IN_PARAMETERS);
$chunks = array_chunk($fileIds, 500);

foreach ($chunks as $chunk) {
$qb = $this->dbConnection->getQueryBuilder();
$expr = $qb->expr();
$qb->delete(self::TABLE_METADATA_INDEX)
->where($expr->in('file_id', $qb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)));
$this->dbConnection->beginTransaction();
try {
foreach ($chunks as $chunk) {
$qb = $this->dbConnection->getQueryBuilder();
$expr = $qb->expr();
$qb->delete(self::TABLE_METADATA_INDEX)
->where($expr->in('file_id', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));

if ($key !== '') {
$qb->andWhere($expr->eq('meta_key', $qb->createNamedParameter($key)));
}
if ($key !== '') {
$qb->andWhere($expr->eq('meta_key', $qb->createNamedParameter($key)));
}

$qb->executeStatement();
$qb->executeStatement();
}
$this->dbConnection->commit();
} catch (DbException $e) {
$this->dbConnection->rollBack();
throw $e;
}
}
}
21 changes: 14 additions & 7 deletions lib/private/FilesMetadata/Service/MetadataRequestService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,21 @@ public function dropMetadata(int $fileId): void {
* @throws Exception
*/
public function dropMetadataForFiles(int $storage, array $fileIds): void {
$chunks = array_chunk($fileIds, IQueryBuilder::MAX_IN_PARAMETERS);
$chunks = array_chunk($fileIds, 500);

foreach ($chunks as $chunk) {
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete(self::TABLE_METADATA)
->where($qb->expr()->in('file_id', $qb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)))
->hintShardKey('storage', $storage);
$qb->executeStatement();
$this->dbConnection->beginTransaction();
try {
foreach ($chunks as $chunk) {
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete(self::TABLE_METADATA)
->where($qb->expr()->in('file_id', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)))
->hintShardKey('storage', $storage);
$qb->executeStatement();
}
$this->dbConnection->commit();
} catch (Exception $e) {
$this->dbConnection->rollBack();
throw $e;
}
}

Expand Down
65 changes: 65 additions & 0 deletions tests/lib/FilesMetadata/FilesMetadataManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,69 @@ public function testRefreshMetadata(): void {
$this->assertEquals($file->getId(), $retrieved->getFileId());
$this->assertEquals('yes', $retrieved->getString('istest'));
}

public function testDropMetadataForFilesChunking(): void {
$connection = $this->createMock(IDBConnection::class);
$qb = $this->createMock(\OCP\DB\QueryBuilder\IQueryBuilder::class);
$expr = $this->createMock(\OCP\DB\QueryBuilder\IExpressionBuilder::class);

$connection->expects($this->once())->method('beginTransaction');
$connection->expects($this->once())->method('commit');
$connection->expects($this->never())->method('rollBack');

$connection->method('getQueryBuilder')->willReturn($qb);
$qb->method('expr')->willReturn($expr);
$qb->method('delete')->willReturnSelf();
$qb->method('where')->willReturnSelf();
$qb->method('hintShardKey')->willReturnSelf();

// We chunk 2000 items into 500. So we expect 4 queries.
$fileIds = range(1, 2000);

$qb->expects($this->exactly(4))
->method('createNamedParameter')
->with($this->callback(function (array $chunk) {
return count($chunk) === 500;
}), \OCP\DB\QueryBuilder\IQueryBuilder::PARAM_INT_ARRAY)
->willReturn(':param');

$qb->expects($this->exactly(4))
->method('executeStatement')
->willReturn(1);

$service = new MetadataRequestService($connection, $this->logger);
$service->dropMetadataForFiles(123, $fileIds);
}

public function testDropIndexForFilesChunking(): void {
$connection = $this->createMock(IDBConnection::class);
$qb = $this->createMock(\OCP\DB\QueryBuilder\IQueryBuilder::class);
$expr = $this->createMock(\OCP\DB\QueryBuilder\IExpressionBuilder::class);

$connection->expects($this->once())->method('beginTransaction');
$connection->expects($this->once())->method('commit');
$connection->expects($this->never())->method('rollBack');

$connection->method('getQueryBuilder')->willReturn($qb);
$qb->method('expr')->willReturn($expr);
$qb->method('delete')->willReturnSelf();
$qb->method('where')->willReturnSelf();

$fileIds = range(1, 2000);

$qb->expects($this->exactly(4))
->method('createNamedParameter')
->with($this->callback(function (array $chunk) {
return count($chunk) === 500;
}), \OCP\DB\QueryBuilder\IQueryBuilder::PARAM_INT_ARRAY)
->willReturn(':param');

$qb->expects($this->exactly(4))
->method('executeStatement')
->willReturn(1);

$service = new IndexRequestService($connection, $this->logger);
$service->dropIndexForFiles($fileIds);
}
}