Skip to content

[stable21] better cleanup of filecache when deleting an external storage #28199

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
MichaIng merged 2 commits into from
Nov 25, 2021
Merged

[stable21] better cleanup of filecache when deleting an external storage #28199

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3dc399
better cleanup of filecache when deleting an external storage
icewind1991 May 10, 2021
9db0703
Use pre-v22 query commands
MichaIng Nov 18, 2021
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
Prev Previous commit
Use pre-v22 query commands 
Signed-off-by: MichaIng <[email protected]>
  • Loading branch information
@MichaIng
MichaIng committed Nov 24, 2021
commit 9db07032d5902af05e6b8af941e651bc04d0bad0
8 changes: 4 additions & 4 deletions lib/private/Files/Cache/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,22 +236,22 @@ public static function cleanByMountId(int $mountId) {
$query->select('storage_id')
->from('mounts')
->where($query->expr()->eq('mount_id', $query->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
$storageIds = $query->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
$storageIds = $query->execute()->fetchAll(\PDO::FETCH_COLUMN);

$query = $db->getQueryBuilder();
$query->delete('filecache')
->where($query->expr()->in('storage', $query->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY)));
$query->executeStatement();
$query->execute();

$query = $db->getQueryBuilder();
$query->delete('storages')
->where($query->expr()->eq('numeric_id', $query->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY)));
$query->executeStatement();
$query->execute();

$query = $db->getQueryBuilder();
$query->delete('mounts')
->where($query->expr()->eq('mount_id', $query->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
$query->executeStatement();
$query->execute();

$db->commit();
} catch (\Exception $e) {
Expand Down