[Cache] Handle arbitrary key length when the backend cant using hashing #20037
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
nicolas-grekas
commented
Sep 23, 2016
| return $this->namespace.$key; | ||
| } | ||
| if (strlen($id = $this->namespace.$key) > $this->maxIdLength) { | ||
| $id = $this->namespace.substr_replace(base64_encode(md5($key, true)), ':', -2); |
There was a problem hiding this comment.
Namespace excluded, this is always 23 chars long, trailing padding = removed.
There was a problem hiding this comment.
The added trailing : is to prevent any collision between hashed keys and non-hasked keys.
nicolas-grekas
commented
Sep 23, 2016
| @@ -37,9 +37,9 @@ public function __construct($namespace = '', $defaultLifetime = 0, $version = nu | |||
| if (null !== $version) { | |||
| CacheItem::validateKey($version); | |||
|
|
|||
| if (!apcu_exists($version.':'.$namespace)) { | |||
| if (!apcu_exists($version.'@'.$namespace)) { | |||
There was a problem hiding this comment.
Just because : is a nice separator for namespace, thus had to change here. @ looks good also for version :)
There was a problem hiding this comment.
It's all about the looks ;)
nicolas-grekas
commented
Sep 23, 2016
| protected function __construct($namespace = '', $defaultLifetime = 0) | ||
| { | ||
| $this->namespace = '' === $namespace ? '' : $this->getId($namespace); | ||
| $this->namespace = '' === $namespace ? '' : $this->getId($namespace).':'; |
There was a problem hiding this comment.
: is a reserved char per psr6 so we use it internally to be free from any collision when concatenating keys and namespace later on
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Sep 24, 2016
…ant using hashing (nicolas-grekas) This PR was merged into the 3.2-dev branch. Discussion ---------- [Cache] Handle arbitrary key length when the backend cant using hashing | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Saving some bits from #19521 :) Already awaited by PdoAdapter which defines the property. Commits ------- 11f448f [Cache] Handle arbitrary key length when the backend cant using hashing
Merged
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.
Saving some bits from #19521 :) Already awaited by PdoAdapter which defines the property.