[Routing] Fix same-prefix aggregation #26208
Merged
Conversation
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
linaori
reviewed
Feb 17, 2018
| return null; | ||
| list($commonPrefix, $commonStaticPrefix) = $this->getCommonPrefix($prefix, $this->prefixes[$i]); | ||
|
|
||
| if (strlen($this->prefix) >= strlen($commonPrefix)) { |
There was a problem hiding this comment.
Not sure how often this is called or if performance matters, but the prefix property doesn't change from what I can tell, should the result be cached? There are a few there are a few more uses of this property like this.
There was a problem hiding this comment.
fixed by adding a \, nothing else to gain from caching the length
0023d65 to
d514f81
Compare
staabm
reviewed
Feb 18, 2018
| } | ||
|
|
||
| /** | ||
| * Checks whether a prefix can be contained within the group. | ||
| */ | ||
| private function accepts(string $prefix): bool | ||
| { | ||
| return '' === $this->prefix || 0 === strpos($prefix, $this->prefix); | ||
| return 0 === strpos($prefix, $this->prefix) && '?' !== ($prefix[\strlen($this->prefix)] ?? ''); |
There was a problem hiding this comment.
Isnt the 2nd check faster then the first ..? Should order of the check be in reverse order?
There was a problem hiding this comment.
the 2nd check is also always true, the 1st less. I'd keep it this way, feels more readable IMHO
Tobion
approved these changes
Feb 18, 2018
fabpot
approved these changes
Feb 19, 2018
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Feb 19, 2018
This PR was merged into the 4.1-dev branch. Discussion ---------- [Routing] Fix same-prefix aggregation | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The blog post on http://symfony.com/blog/new-in-symfony-4-1-fastest-php-router made me review the aggregation logic, and discover issues. So now, instead of this: ``` .'|/(en|fr)/admin/post/?(*:82)' .'|/(en|fr)/admin/post/new(*:166)' .'|/(en|fr)/admin/post/(\\d+)(*:253)' .'|/(en|fr)/admin/post/(\\d+)/edit(*:345)' .'|/(en|fr)/admin/post/(\\d+)/delete(*:442)' .'|/(en|fr)/blog/?(*:519)' .'|/(en|fr)/blog/rss\\.xml(*:603)' .'|/(en|fr)/blog/page/([^/]++)(*:694)' .'|/(en|fr)/blog/posts/([^/]++)(*:784)' .'|/(en|fr)/blog/comment/(\d+)/new(*:880)' .'|/(en|fr)/blog/search(*:962)' .'|/(en|fr)/login(*:1038)' .'|/(en|fr)/logout(*:1116)' .'|/(en|fr)?(*:1188)' ``` we generate this: ``` .'|/(en|fr)(?' .'|/admin/post(?' .'|/?(*:34)' .'|/new(*:45)' .'|/(\\d+)(?' .'|(*:61)' .'|/edit(*:73)' .'|/delete(*:87)' .')' .')' .'|/blog(?' .'|/?(*:106)' .'|/rss\\.xml(*:123)' .'|/p(?' .'|age/([^/]++)(*:148)' .'|osts/([^/]++)(*:169)' .')' .'|/comments/(\\d+)/new(*:197)' .'|/search(*:212)' .')' .'|/log(?' .'|in(*:230)' .'|out(*:241)' .')' .')' .'|/(en|fr)?(*:260)' ``` This is not only another perf fix, but a real bug fix, as I found ordering issues. Commits ------- d514f81 [Routing] Fix same-prefix aggregation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Follows #26059 and #26169.
The blog post on http://symfony.com/blog/new-in-symfony-4-1-fastest-php-router made me review the aggregation logic, and discover issues.
So now, instead of this:
we generate this:
This is not only another perf fix, but a real bug fix, as I found ordering issues.