Skip to content

[stable27] Reduce the number of container queries #39890

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
AndyScherzinger merged 5 commits into from
Sep 8, 2023
Merged

[stable27] Reduce the number of container queries #39890

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ebceaa
reuse dependencies from wrapped cache
icewind1991 Aug 15, 2023
4c604bf
only gather dependencies for trashbin wrapper once
icewind1991 Aug 15, 2023
a23447c
better caching in storage stats calculations
icewind1991 Aug 15, 2023
9242e89
only get logger when needed in sabre/directory
icewind1991 Aug 15, 2023
ee8c1a5
only determine quota_include_external_storage once for quota wrapper
icewind1991 Aug 15, 2023
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
only gather dependencies for trashbin wrapper once 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Sep 7, 2023
commit 4c604bf53106e76609e7fd368e12fcfdd46e6f42
32 changes: 20 additions & 12 deletions apps/files_trashbin/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Storage extends Wrapper {
* Storage constructor.
*
* @param array $parameters
* @param ITrashManager $trashManager
* @param ITrashManager|null $trashManager
* @param IUserManager|null $userManager
* @param ILogger|null $logger
* @param EventDispatcherInterface|null $eventDispatcher
Expand Down Expand Up @@ -208,19 +208,27 @@ private function doDelete($path, $method) {
}

/**
* Setup the storate wrapper callback
* Setup the storage wrapper callback
*/
public static function setupStorage() {
\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
return new \OCA\Files_Trashbin\Storage(
['storage' => $storage, 'mountPoint' => $mountPoint],
\OC::$server->query(ITrashManager::class),
\OC::$server->getUserManager(),
\OC::$server->getLogger(),
\OC::$server->getEventDispatcher(),
\OC::$server->getLazyRootFolder()
);
}, 1);
$trashManager = \OC::$server->get(ITrashManager::class);
$userManager = \OC::$server->get(IUserManager::class);
$logger = \OC::$server->get(ILogger::class);
$eventDispatcher = \OC::$server->get(EventDispatcherInterface::class);
$rootFolder = \OC::$server->get(IRootFolder::class);
Filesystem::addStorageWrapper(
'oc_trashbin',
function (string $mountPoint, IStorage $storage) use ($trashManager, $userManager, $logger, $eventDispatcher, $rootFolder) {
return new Storage(
['storage' => $storage, 'mountPoint' => $mountPoint],
$trashManager,
$userManager,
$logger,
$eventDispatcher,
$rootFolder,
);
},
1);
}

public function getMountPoint() {
Expand Down