Skip to content

perf(MountProvider): optimize and improve conflict handling #4451

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
solracsf wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −21
Open

perf(MountProvider): optimize and improve conflict handling #4451

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
63 changes: 42 additions & 21 deletions lib/Mount/MountProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,43 +54,64 @@ public function __construct(
public function getMountsForUser(IUser $user, IStorageFactory $loader): array {
$folders = $this->folderManager->getFoldersForUser($user);

$mountPoints = array_map(fn (FolderDefinitionWithPermissions $folder): string => 'files/' . $folder->mountPoint, $folders);
$conflicts = $this->findConflictsForUser($user, $mountPoints);
// Single pass to build both mountPoints and ACL data
$mountPoints = [];
$rootFileIds = [];

/** @var array<FolderDefinitionWithPermissions> $foldersWithAcl */
$foldersWithAcl = array_filter($folders, fn (FolderDefinitionWithPermissions $folder): bool => $folder->acl);
$rootFileIds = array_map(fn (FolderDefinitionWithPermissions $folder): int => $folder->rootId, $foldersWithAcl);
foreach ($folders as $folder) {
$mountPoints[] = 'files/' . $folder->mountPoint;
if ($folder->acl) {
$rootFileIds[] = $folder->rootId;
}
}

$conflicts = array_flip($this->findConflictsForUser($user, $mountPoints));
$aclManager = $this->aclManagerFactory->getACLManager($user);
$rootRules = $aclManager->getRulesByFileIds($rootFileIds);
$rootRules = $rootFileIds
? $aclManager->getRulesByFileIds($rootFileIds)
: [];

return array_map(function (FolderDefinitionWithPermissions $folder) use ($user, $loader, $conflicts, $aclManager, $rootRules): IMountPoint {
// check for existing files in the user home and rename them if needed
$userStorage = null;
$mounts = [];

foreach ($folders as $folder) {
$originalFolderName = $folder->mountPoint;
if (in_array($originalFolderName, $conflicts)) {
/** @var IStorage $userStorage */
$userStorage = $this->mountProviderCollection->getHomeMountForUser($user)->getStorage();
$userCache = $userStorage->getCache();
$i = 1;
$folderName = $folder->mountPoint . ' (' . $i++ . ')';

while ($userCache->inCache("files/$folderName")) {
if (isset($conflicts[$originalFolderName])) {
if ($userStorage === null) {
/** @var IStorage $userStorage */
$userStorage = $this->mountProviderCollection->getHomeMountForUser($user)->getStorage();
}

$i = 1;
$folderName = $originalFolderName . ' (' . $i++ . ')';
$cache = $userStorage->getCache();
while ($cache->inCache('files/' . $folderName)) {
$folderName = $originalFolderName . ' (' . $i++ . ')';
}

$userStorage->rename("files/$originalFolderName", "files/$folderName");
$userCache->move("files/$originalFolderName", "files/$folderName");
$userStorage->getPropagator()->propagateChange("files/$folderName", time());
$userStorage->rename(
'files/' . $originalFolderName,
'files/' . $folderName
);
$cache->move(
'files/' . $originalFolderName,
'files/' . $folderName
);
$userStorage->getPropagator()->propagateChange('files/' . $folderName, time());
}

return $this->getMount(
$mounts[] = $this->getMount(
$folder,
'/' . $user->getUID() . '/files/' . $folder->mountPoint,
'/' . $user->getUID() . '/files/' . $originalFolderName,
$loader,
$user,
$aclManager,
$rootRules[$folder->storageId] ?? [],
);
}, $folders);
}

return $mounts;
}

private function getCurrentUID(): ?string {
Expand Down
Loading