[Yaml] Optimise Inline::evaluateScalar() for parsing strings. #10312
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
|
Found another optimisation. Happy to split this into a separate PR if you think it is worth it. Again this has quite a big impact on the Drupal installer. |
| case preg_match(self::getTimestampRegex(), $scalar): | ||
| return strtotime($scalar); | ||
| // Optimise for returning strings. | ||
| case $scalar[0] === '+' || $scalar[0] === '-' || $scalar[0] === '.' || $scalar[0] === '!' || is_numeric($scalar[0]): |
There was a problem hiding this comment.
Is there a reason to not just use in_array(..., TRUE)?
There was a problem hiding this comment.
It is slower. Not hugely - but in_array is more expensive
There was a problem hiding this comment.
it's better to split the case statements:
case $scalar[0] === '+' :
case $scalar[0] === '-':
case $scalar[0] === '.':
case $scalar[0] === '!':
case is_numeric($scalar[0]):|
Given that the Inline class has quite some test coverage I think we don't need additional coverage. |
|
Thanks @alexpott. |
fabpot
added a commit
that referenced
this pull request
Feb 23, 2014
…ings. (alexpott) This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10312). Discussion ---------- [Yaml] Optimise Inline::evaluateScalar() for parsing strings. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The Drupal 8 installer does a lot of YAML parsing. With the patch attached it is significantly quicker.  https://drupal.org/node/1851234 Commits ------- 10c898d Avoid unnecessary line indentation calculation. c65a647 Optimise Inline::evaluateScalar() for parsing strings.
| switch (true) { | ||
| case 0 === strpos($scalar, '!str'): | ||
| return (string) substr($scalar, 5); | ||
| case 0 === strpos($scalar, '! '): |
There was a problem hiding this comment.
Why not use $scalar[0] === '!' here as well?
There was a problem hiding this comment.
The strpos() check would still be required for differentiating between !str and !, and all other cases, so that change would not present a perf improvement.
There was a problem hiding this comment.
@Tobion have you missed the space after ! ?
sun
added a commit
to sun/symfony
that referenced
this pull request
Feb 25, 2014
fabpot
pushed a commit
that referenced
this pull request
Feb 25, 2014
fabpot
added a commit
that referenced
this pull request
Feb 25, 2014
…line. (sun) This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10323). Discussion ---------- [Yaml] Fixed minor performance related issues in Yaml\Inline. Follow-up to #10312 | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- a36fef5 Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline.
fabpot
added a commit
that referenced
this pull request
Feb 27, 2014
* 2.3: bumped Symfony version to 2.3.12 updated VERSION for 2.3.11 update CONTRIBUTORS for 2.3.11 updated CHANGELOG for 2.3.11 Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline. Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
fabpot
added a commit
that referenced
this pull request
Mar 3, 2014
* 2.4: [Form][2.3] Fixes empty file-inputs getting treated as extra field. changed some PHPUnit assertions to more specific ones fixed Kernel::stripComments() normalizing new-lines added a BC comment Update FileLoader to fix issue #10339 bumped Symfony version to 2.3.12 updated VERSION for 2.3.11 update CONTRIBUTORS for 2.3.11 updated CHANGELOG for 2.3.11 Throw exception when unable to normalize embedded object Fixed evaluation of short circuit operators Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline. [2.4][HttpKernel] Fix issue #10209 When the profiler has `only_exception` option activated and a subrequest throw an exception, the parent profile cannot be found.
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.
The Drupal 8 installer does a lot of YAML parsing. With the patch attached it is significantly quicker.
https://drupal.org/node/1851234