perf: only load possible results in UserMountCache::getMountForPath#59649
Closed
icewind1991 wants to merge 0 commit intomasterfrom
Closed
perf: only load possible results in UserMountCache::getMountForPath#59649icewind1991 wants to merge 0 commit intomasterfrom
icewind1991 wants to merge 0 commit intomasterfrom
Conversation
icewind1991
requested review from
Altahrim,
leftybournes,
nfebe and
salmart-dev
and removed request for
a team
Member
Author
|
/backport to stable33 |
Member
Author
|
/backport to stable32 |
salmart-dev
approved these changes
Apr 15, 2026
CarlSchwan
approved these changes
Apr 17, 2026
Member
joshtrichards
left a comment
joshtrichards
left a comment
There was a problem hiding this comment.
Seems like a reasonable optimization. Just some minor comment/suggestions.
| // 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 |
Member
There was a problem hiding this comment.
Super minor comment tweak:
Suggested change
| // get all paths that we are interested in, $path and all it's parents | |
| // get all paths that we are interested in, $path and all its parents |
| } | ||
| } | ||
|
|
||
| // note that $searchPaths is sorted deepest path first |
Member
There was a problem hiding this comment.
Minor clarity:
Suggested change
| // note that $searchPaths is sorted deepest path first | |
| // $searchPaths is ordered deepest-first, so the first hit is the best match. |
|
|
||
| // note that $searchPaths is sorted deepest path first | ||
| foreach ($searchPaths as $searchPath) { | ||
| if (isset($mounts[$searchPath])) { |
Member
There was a problem hiding this comment.
Readability: Maybe use $candidateMounts throughout instead of $mounts to make this final matching loop easier to parse iclearer these are the possible matches, not necessarily all user mounts.
Suggested change
| if (isset($mounts[$searchPath])) { | |
| if (isset($candidateMounts[$searchPath])) { |
| $mounts[$mount->getMountPoint()] = $mount; | ||
| } | ||
| } else { | ||
| $searchPathHashes = array_map(static fn (string $path) => hash('xxh128', $path), $searchPaths); |
Member
There was a problem hiding this comment.
Readability: Maybe rename the closure arg from $path to $candidatePath to avoid reusing the overarching function parameter's existing parameter name.
| $this->assertEquals([null, 1], $mountIds); | ||
| } | ||
|
|
||
| public function testGetMountForPath(): void { |
Member
There was a problem hiding this comment.
Perhaps also a test for the negative / NotFoundException path?
susnux
force-pushed
the
usermountcache-get-by-path-opt
branch
from
860dcce to
be5d980
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Extracted from #57760 for easier reviews.
Instead of always loading all mounts for the user and then finding the relevant one for a path. We first collect the possible paths the mountpoint can be at (the path and all it's parents), and then only load the mounts for those paths.