Skip to content

[stable33] perf: Only sort wrappers when adding them #61718

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

Draft
backportbot wants to merge 1 commit into
base: stable33
Choose a base branch
from
+14 −14
Draft

[stable33] perf: Only sort wrappers when adding them #61718

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
28 changes: 14 additions & 14 deletions lib/private/Files/Storage/StorageFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
use Psr\Log\LoggerInterface;

class StorageFactory implements IStorageFactory {
/**
* @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers
*/
private $storageWrappers = [];
/** @var array<string, array{wrapper: callable(string $mountPoint, IStorage $storage): IStorage, priority: int}> $storageWrappers */
private array $storageWrappers = [];

/** @var bool $dirty Whether the list of storage wrappers is sorted */
private bool $dirty = true;

public function addStorageWrapper(string $wrapperName, callable $callback, int $priority = 50, array $existingMounts = []): bool {
if (isset($this->storageWrappers[$wrapperName])) {
Expand All @@ -30,6 +31,7 @@ public function addStorageWrapper(string $wrapperName, callable $callback, int $
}

$this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority];
$this->dirty = true;
return true;
}

Expand All @@ -54,16 +56,14 @@ public function getInstance(IMountPoint $mountPoint, string $class, array $argum
}

public function wrap(IMountPoint $mountPoint, IStorage $storage): IStorage {
$wrappers = array_values($this->storageWrappers);
usort($wrappers, function ($a, $b) {
return $b['priority'] - $a['priority'];
});
/** @var callable[] $wrappers */
$wrappers = array_map(function ($wrapper) {
return $wrapper['wrapper'];
}, $wrappers);
foreach ($wrappers as $wrapper) {
$storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
if ($this->dirty) {
uasort($this->storageWrappers, static fn (array $a, array $b) => $b['priority'] - $a['priority']);
$this->dirty = false;
}
foreach ($this->storageWrappers as $wrapper) {
/** @var callable(string, IStorage, IMountPoint): IStorage $wrapperCallable */
$wrapperCallable = $wrapper['wrapper'];
$storage = $wrapperCallable($mountPoint->getMountPoint(), $storage, $mountPoint);
if (!($storage instanceof IStorage)) {
throw new \Exception('Invalid result from storage wrapper');
}
Expand Down
Loading