Improve performance #216
Open
Improve performance #216
Conversation
This file contains 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
I have identified three main bottlenecks when profiling the code with xdebug: 1. `array_shift()`: The array of tokens ended up being renumbered on each iteration. So we instead set consumed tokens to `null`. 2. `mb_substr()`: Using mutltibyte here is unnecessary and overkill, when we can just operate directly on the string. 3. `Liquid::get()`: This one surprised me, but due to the number of calls, here it is. Shave off more processing time by accessing the config array directly.
sanmai
approved these changes
May 10, 2024
| @@ -254,7 +258,7 @@ private function blockName() | |||
| */ | |||
| private function createVariable($token) | |||
| { | |||
| $variableRegexp = new Regexp('/^' . Liquid::get('VARIABLE_START') . Liquid::get('WHITESPACE_CONTROL') . '?(.*?)' . Liquid::get('WHITESPACE_CONTROL') . '?' . Liquid::get('VARIABLE_END') . '$/s'); | |||
| $variableRegexp = new Regexp('/^' . Liquid::$config['VARIABLE_START'] . Liquid::$config['WHITESPACE_CONTROL'] . '?(.*?)' . Liquid::$config['WHITESPACE_CONTROL'] . '?' . Liquid::$config['VARIABLE_END'] . '$/s'); | |||
There was a problem hiding this comment.
What do you think about making it an instance variable instead so we would fetch the constants only once?
There was a problem hiding this comment.
I.e. $this->variableRegexp and initialize only once.
live627
commented
May 10, 2024
| @@ -129,7 +133,7 @@ protected function whitespaceHandler($token) | |||
| * This assumes that TAG_END is always '%}', and a whitespace control indicator | |||
| * is exactly one character long, on a third position from the end. | |||
| */ | |||
| self::$trimWhitespace = mb_substr($token, -3, 1) === Liquid::get('WHITESPACE_CONTROL'); | |||
| self::$trimWhitespace = $token[-3] === Liquid::$config['WHITESPACE_CONTROL']; | |||
There was a problem hiding this comment.
this requires bumping min php to 7.1 because of negative string offset https://wiki.php.net/rfc/negative-string-offsets
There was a problem hiding this comment.
We already require 7.4 min, so that's non-issue 🙂
sanmai
requested changes
Oct 6, 2024
| $variableStartRegexp = new Regexp('/^' . Liquid::get('VARIABLE_START') . '/'); | ||
| $startRegexp = new Regexp('/^' . Liquid::$config['TAG_START'] . '/'); | ||
| $tagRegexp = new Regexp('/^' . Liquid::$config['TAG_START'] . Liquid::$config['WHITESPACE_CONTROL'] . '?\s*(\w+)\s*(.*?)' . Liquid::$config['WHITESPACE_CONTROL'] . '?' . Liquid::$config['TAG_END'] . '$/s'); | ||
| $variableStartRegexp = new Regexp('/^' . Liquid::$config['VARIABLE_START'] . '/'); |
There was a problem hiding this comment.
Suggested change
| $variableStartRegexp = new Regexp('/^' . Liquid::$config['VARIABLE_START'] . '/'); | |
| $variableStartRegexp = new Regexp('/^' . $this->config['VARIABLE_START'] . '/'); |
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.
I have identified three main bottlenecks when profiling the code with xdebug:
array_shift(): The array of tokens ended up being renumbered on each iteration. So we instead set consumed tokens tonull.mb_substr(): Using mutltibyte here is unnecessary and overkill, when we can just operate directly on the string.Liquid::get(): This one surprised me, but due to the number of calls, here it is. Shave off more processing time by accessing the config array directly.