mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20724 from nextcloud/remove-children-non-recursive 

Make Cache::removeChildren non recursive
This commit is contained in:
Morris Jobke 2020-08-20 16:50:33 +02:00 committed by GitHub
parent 420a3762cb 8381af626f
commit 67ecdc969c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/psalm-baseline.xml
View File

@ -4022,6 +4022,11 @@
<code>$entry</code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Files/Cache/CacheQueryBuilder.php">
<ImplicitToStringCast occurrences="1">
<code>$this-&gt;createNamedParameter($parents, IQueryBuilder::PARAM_INT_ARRAY)</code>
</ImplicitToStringCast>
</file>
<file src="lib/private/Files/Cache/FailedCache.php">
<InvalidReturnStatement occurrences="1">
<code>[]</code>

40
lib/private/Files/Cache/Cache.php
View File

@ -553,25 +553,35 @@ class Cache implements ICache {
* @throws \OC\DatabaseException
*/
private function removeChildren(ICacheEntry $entry) {
$children = $this->getFolderContentsById($entry->getId());
$childIds = array_map(function (ICacheEntry $cacheEntry) {
return $cacheEntry->getId();
}, $children);
$childFolders = array_filter($children, function ($child) {
return $child->getMimeType() == FileInfo::MIMETYPE_FOLDER;
});
foreach ($childFolders as $folder) {
$this->removeChildren($folder);
$parentIds = [$entry->getId()];
$queue = [$entry->getId()];
// we walk depth first trough the file tree, removing all filecache_extended attributes while we walk
// and collecting all folder ids to later use to delete the filecache entries
while ($entryId = array_pop($queue)) {
$children = $this->getFolderContentsById($entryId);
$childIds = array_map(function (ICacheEntry $cacheEntry) {
return $cacheEntry->getId();
}, $children);
$query = $this->getQueryBuilder();
$query->delete('filecache_extended')
->where($query->expr()->in('fileid', $query->createNamedParameter($childIds, IQueryBuilder::PARAM_INT_ARRAY)));
$query->execute();
/** @var ICacheEntry[] $childFolders */
$childFolders = array_filter($children, function ($child) {
return $child->getMimeType() == FileInfo::MIMETYPE_FOLDER;
});
foreach ($childFolders as $folder) {
$parentIds[] = $folder->getId();
$queue[] = $folder->getId();
}
}
$query = $this->getQueryBuilder();
$query->delete('filecache')
->whereParent($entry->getId());
$query->execute();
$query = $this->getQueryBuilder();
$query->delete('filecache_extended')
->where($query->expr()->in('fileid', $query->createNamedParameter($childIds, IQueryBuilder::PARAM_INT_ARRAY)));
->whereParentIn($parentIds);
$query->execute();
}

13
lib/private/Files/Cache/CacheQueryBuilder.php
View File

@ -94,4 +94,17 @@ class CacheQueryBuilder extends QueryBuilder {
return $this;
}
public function whereParentIn(array $parents) {
$alias = $this->alias;
if ($alias) {
$alias .= '.';
} else {
$alias = '';
}
$this->andWhere($this->expr()->in("{$alias}parent", $this->createNamedParameter($parents, IQueryBuilder::PARAM_INT_ARRAY)));
return $this;
}
}