[Yaml] save preg_match() calls when possible #28106
Conversation
xabbuh
commented
Aug 1, 2018
| Q | A |
|---|---|
| Branch? | master |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | possibly #27960 |
| License | MIT |
| Doc PR |
|
This is how it looks like: Parsing the
(see Executing the Yaml component test suite:
(see https://blackfire.io/profiles/compare/b2f2e6a6-87d3-40ad-95dd-52a2ba6bdda7/graph) |
|
Thank you @xabbuh. |
This PR was merged into the 4.2-dev branch. Discussion ---------- [Yaml] save preg_match() calls when possible | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | possibly #27960 | License | MIT | Doc PR | Commits ------- e6bea97 save preg_match() calls when possible
|
@xabbuh why does it save so much time in IOWait? The changes are not IO related.. |
| if ($context && 'mapping' == $context) { | ||
| throw new ParseException('You cannot define a sequence item when in a mapping', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename); | ||
| } | ||
| $context = 'sequence'; | ||
|
|
||
| if (isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) { | ||
| if (isset($values['value']) && '&' === $values['value'][0] && self::preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) { |
There was a problem hiding this comment.
Is it possible to have $values['value'] being the empty string here or no ? If yes, we have a bug.
There was a problem hiding this comment.
No, the regular expression that has to match to reach this part of the code is #^\-((?P<leadspaces>\s+)(?P<value>.+))?$#u. So if the value element is set, it must have at least on character.
There was a problem hiding this comment.
yeah, the value group can indeed not be empty when it is matched, so things are fine.
| @@ -1009,7 +1011,7 @@ private function isStringUnIndentedCollectionItem(): bool | |||
| */ | |||
| private function isBlockScalarHeader(): bool | |||
| { | |||
| return (bool) self::preg_match('~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~', $this->currentLine); | |||
| return '' !== $this->currentLine && (bool) self::preg_match('~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~', $this->currentLine); | |||
There was a problem hiding this comment.
what about adding && \in_array($this->currentLine[0], array('|', '>'), true) && here too ?
There was a problem hiding this comment.
I thought about that too, but the regular expression should also match lines like foo: | or foo: >2, shouldn't it?
There was a problem hiding this comment.
hmm indeed. This regex is not anchored at the start. I missed that
There was a problem hiding this comment.
I just remembered that I indeed tried to add that check and was wondering now why tests didn't fail then. Turns out this method is totally useless with the current code (see #28187).
|
@staabm probably cold vs warm OPCache cache (and so bypassing the IO for many files) |
|
@staabm I think what @stof said. You can see updated profile comparisons at https://blackfire.io/profiles/compare/9de46b73-d563-4e0e-a81a-553cc3d5f290/graph (parsing the |