Skip to content

[stable31] fix: Proper order for checking path prefix for getting file by id from cache #52039

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

Merged
merged 2 commits into from
Apr 22, 2025
Merged

[stable31] fix: Proper order for checking path prefix for getting file by id from cache #52039

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f2228
fix: Proper order for checking path prefix for getting file by id fro…
juliusknorr Apr 7, 2025
e5209d4
fix: Catch old cached paths and fetch the new one
juliusknorr Apr 8, 2025
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
16 changes: 10 additions & 6 deletions lib/private/Files/Node/Root.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,13 +384,17 @@ public function getFirstNodeByIdInPath(int $id, string $path): ?INode {
// scope the cache by user, so we don't return nodes for different users
if ($this->user) {
$cachedPath = $this->pathByIdCache->get($this->user->getUID() . '::' . $id);
if ($cachedPath && str_starts_with($path, $cachedPath)) {
if ($cachedPath && str_starts_with($cachedPath, $path)) {
// getting the node by path is significantly cheaper than finding it by id
$node = $this->get($cachedPath);
// by validating that the cached path still has the requested fileid we can work around the need to invalidate the cached path
// if the cached path is invalid or a different file now we fall back to the uncached logic
if ($node && $node->getId() === $id) {
return $node;
try {
$node = $this->get($cachedPath);
// by validating that the cached path still has the requested fileid we can work around the need to invalidate the cached path
// if the cached path is invalid or a different file now we fall back to the uncached logic
if ($node && $node->getId() === $id) {
return $node;
}
} catch (NotFoundException|NotPermittedException) {
// The file may be moved but the old path still in cache
}
}
}
Expand Down
Loading