upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

perf: only load possible results in UserMountCache::getMountForPath

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2026-04-14 22:09:54 +02:00
parent 41e6124dcc
commit ac9da6eaa0
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
1 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lib/private/Files/Config/UserMountCache.php
View file

@ -488,21 +488,13 @@ class UserMountCache implements IUserMountCache {
}
public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
$mounts = [];
foreach ($this->getMountsForUser($user) as $mount) {
$mounts[$mount->getMountPoint()] = $mount;
}
$searchPaths = [];
$current = rtrim($path, '/');
// walk up the directory tree until we find a path that has a mountpoint set
// the loop will return if a mountpoint is found or break if none are found
while (true) {
// get all paths that we are interested in, $path and all it's parents
while ($current !== '') {
$mountPoint = $current . '/';
if (isset($mounts[$mountPoint])) {
return $mounts[$mountPoint];
} elseif ($current === '') {
break;
}
$searchPaths[] = $mountPoint;
$current = dirname($current);
if ($current === '.' || $current === '/') {
@ -510,6 +502,34 @@ class UserMountCache implements IUserMountCache {
}
}
$mounts = [];
if (isset($this->mountsForUsers[$user->getUID()])) {
foreach ($this->mountsForUsers[$user->getUID()] as $mount) {
$mounts[$mount->getMountPoint()] = $mount;
}
} else {
$searchPathHashes = array_map(static fn (string $path) => hash('xxh128', $path), $searchPaths);
$builder = $this->connection->getQueryBuilder();
$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
->from('mounts', 'm')
->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())))
->andWhere($builder->expr()->in('mount_point_hash', $builder->createNamedParameter($searchPathHashes, IQueryBuilder::PARAM_STR_ARRAY)));
foreach ($query->executeQuery()->fetchAll() as $row) {
$mount = $this->dbRowToMountInfo($row);
$mounts[$mount->getMountPoint()] = $mount;
}
}
// note that $searchPaths is sorted deepest path first
foreach ($searchPaths as $searchPath) {
if (isset($mounts[$searchPath])) {
return $mounts[$searchPath];
}
}
throw new NotFoundException('No cached mount for path ' . $path);
}