Skip to content

[stable23] Optimize FileSystemTags workflow for groupfolder #30684

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
CarlSchwan merged 4 commits into from
Jan 17, 2022
Merged

[stable23] Optimize FileSystemTags workflow for groupfolder #30684

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88774cf
Optimize FileSystemTags workflow for groupfolder
CarlSchwan Jan 7, 2022
3c060e5
The storage is not static anymore
CarlSchwan Jan 7, 2022
c3fcb2c
Add helper method in Wrapper
CarlSchwan Jan 10, 2022
61624c2
Fix psalm issues
CarlSchwan Jan 13, 2022
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
Next Next commit
The storage is not static anymore 
Don't call twice $cache->getId

Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan @backportbot
CarlSchwan authored and backportbot[bot] committed Jan 14, 2022
commit 3c060e54fa54fa38b0585aaeae4eb262a8a5c98c
26 changes: 11 additions & 15 deletions apps/workflowengine/lib/Check/FileSystemTags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,22 +140,18 @@ protected function getSystemTags() {
protected function getFileIds(ICache $cache, $path, $isExternalStorage) {
/** @psalm-suppress InvalidArgument */
if ($this->storage->instanceOfStorage(\OCA\GroupFolders\Mount\GroupFolderStorage::class)) {
static $groupFolderStorage = null;
if ($groupFolderStorage === null) {
// Special implementation for groupfolder since all groupfolder chare the same storage
// so add the group folder id in the cache key too.
$groupFolderStorage = $this->storage;
$groupFolderStoragClass = \OCA\GroupFolders\Mount\GroupFolderStorage::class;
while ($groupFolderStorage->instanceOfStorage(Wrapper::class)) {
if ($groupFolderStorage instanceof $groupFolderStoragClass) {
break;
}
/**
* @var Wrapper $sourceStorage
*/
$groupFolderStorage = $groupFolderStorage->getWrapperStorage();
// Special implementation for groupfolder since all groupfolders share the same storage
// id so add the group folder id in the cache key too.
$groupFolderStorage = $this->storage;
$groupFolderStorageClass = \OCA\GroupFolders\Mount\GroupFolderStorage::class;
while ($groupFolderStorage->instanceOfStorage(Wrapper::class)) {
if ($groupFolderStorage instanceof $groupFolderStorageClass) {
break;
}
/** @var Wrapper $groupFolderStorage */
$groupFolderStorage = $groupFolderStorage->getWrapperStorage();
}
/** @psalm-suppress UndefinedMethod */
$cacheId = $cache->getNumericStorageId() . '/' . $groupFolderStorage->getFolderId();
} else {
$cacheId = $cache->getNumericStorageId();
Expand All @@ -173,7 +169,7 @@ protected function getFileIds(ICache $cache, $path, $isExternalStorage) {

$fileId = $cache->getId($path);
if ($fileId !== -1) {
$parentIds[] = $cache->getId($path);
$parentIds[] = $fileId;
}

$this->fileIds[$cacheId][$path] = $parentIds;
Expand Down