Skip to content

perf: delay loading storage info in Cache untill needed #59901

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
icewind1991 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf: delay loading storage info in Cache untill needed #59901

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
10 changes: 7 additions & 3 deletions lib/private/Files/Cache/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,15 @@ class Cache implements ICache {
*/
protected array $partial = [];
protected string $storageId;
protected Storage $storageCache;
protected ?Storage $storageCache = null;
protected IMimeTypeLoader $mimetypeLoader;
protected IDBConnection $connection;
protected SystemConfig $systemConfig;
protected LoggerInterface $logger;
protected QuerySearchHelper $querySearchHelper;
protected IEventDispatcher $eventDispatcher;
protected IFilesMetadataManager $metadataManager;
private CacheDependencies $cacheDependencies;

public function __construct(
private IStorage $storage,
Expand All @@ -84,7 +85,7 @@ public function __construct(
if (!$dependencies) {
$dependencies = Server::get(CacheDependencies::class);
}
$this->storageCache = new Storage($this->storage, true, $dependencies->getConnection());
$this->cacheDependencies = $dependencies;
$this->mimetypeLoader = $dependencies->getMimeTypeLoader();
$this->connection = $dependencies->getConnection();
$this->systemConfig = $dependencies->getSystemConfig();
Expand All @@ -102,6 +103,9 @@ protected function getQueryBuilder() {
}

public function getStorageCache(): Storage {
if (!$this->storageCache) {
$this->storageCache = new Storage($this->storage, true, $this->cacheDependencies->getConnection());
}
return $this->storageCache;
}

Expand All @@ -112,7 +116,7 @@ public function getStorageCache(): Storage {
*/
#[\Override]
public function getNumericStorageId() {
return $this->storageCache->getNumericId();
return $this->getStorageCache()->getNumericId();
}

/**
Expand Down
Loading