Skip to content

feat: Cache compiled routes #52793

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
skjnldsv merged 13 commits into from
Jun 5, 2025
Merged

feat: Cache compiled routes #52793

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ee3abdd
feat(router): Cache routes in local cache if possible
come-nc May 6, 2025
01575b7
feat(router): Use Symfony CompiledUrlMatcherDumper to cache routes
come-nc May 13, 2025
5c9092b
fix: Use a more fitting cache key
come-nc May 13, 2025
216da3a
fix: Deprecate action and actionInclude from routes and fix actionInc…
come-nc May 13, 2025
446b22a
feat(router): Add fallback for legacy action and file routes
come-nc May 14, 2025
0d78c60
fix: Fix psalm issue by adding missing parameter for profiler
come-nc May 14, 2025
e8370bf
fix: Use only enabled applications versions in the cache prefix
come-nc Jun 2, 2025
a2fdecc
chore(tests): Adapt AppManager test to the use of searchValues
come-nc Jun 2, 2025
c6f2eff
fix: Fix log display for integration tests
come-nc Jun 3, 2025
89f51a8
chore(tests): Add test for AppConfig::getAppInstalledVersions
come-nc Jun 5, 2025
12e7f46
fix: Use application ids as well as versions in the cache prefix
come-nc Jun 5, 2025
bb485fb
fix: Load all partially enabled apps routes
come-nc Jun 5, 2025
ba53147
chore: update psalm baseline
come-nc Jun 5, 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
Prev Previous commit
Next Next commit
fix: Fix psalm issue by adding missing parameter for profiler 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Jun 5, 2025
commit 0d78c6075948ce4a46adffcd97f742848e9e8a57
4 changes: 2 additions & 2 deletions lib/private/Route/CachingRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private function serializeRouteCollection(RouteCollection $collection): array {
* @return array
*/
public function findMatchingRoute(string $url): array {
$this->eventLogger->start('cacheroute:match');
$this->eventLogger->start('cacheroute:match', 'Match route');
$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . '#rootCollection';
$cachedRoutes = $this->cache->get($key);
if (!$cachedRoutes) {
Expand All @@ -83,7 +83,7 @@ public function findMatchingRoute(string $url): array {
$this->cache->set($key, $cachedRoutes, 3600);
Copy link
Contributor

@susnux susnux Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The key does not include any version number, so this probably means its always cached also on updates?
Because then there is no way to flush on update if the routes have changed, no?

Copy link
Contributor Author

@come-nc come-nc Jun 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the cache have a global prefix with all apps version numbers, see

server/lib/private/Server.php

Line 605 in acc2311

$prefixClosure = function () use ($logQuery, $serverVersion): ?string {

}
$matcher = new CompiledUrlMatcher($cachedRoutes, $this->context);
$this->eventLogger->start('cacheroute:url:match');
$this->eventLogger->start('cacheroute:url:match', 'Symfony URL match call');
try {
$parameters = $matcher->match($url);
} catch (ResourceNotFoundException $e) {
Expand Down