Skip to content

Add a suffix to prevent key collisions with parameterized caches #6315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtdesign merged 2 commits into from
Jun 13, 2025
Merged

Add a suffix to prevent key collisions with parameterized caches #6315

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
261fdf8
Add a suffix to prevent key collisions with parameterized caches
dtdesign Jun 4, 2025
8478c53
Include the regular cache key in the wildcard removal
dtdesign Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions wcfsetup/install/files/lib/system/cache/source/RedisCacheSource.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@ public function flush($cacheName, $useWildcard)
if (isset($parts[1])) {
if ($useWildcard) {
// delete the complete hashset
$this->redis->del($this->getCacheName($parts[0]));
$this->redis->del(
$this->getCacheName($parts[0], true),
$this->getCacheName($parts[0]),
);
} else {
// delete the specified key from the hashset
$this->redis->hDel($this->getCacheName($parts[0]), $parts[1]);
$this->redis->hDel($this->getCacheName($parts[0], true), $parts[1]);
}
} else {
$this->redis->del($this->getCacheName($cacheName));
Expand Down Expand Up @@ -77,7 +80,7 @@ public function get($cacheName, $maxLifetime)
$parts = \explode('-', $cacheName, 2);

if (isset($parts[1])) {
$value = $this->redis->hGet($this->getCacheName($parts[0]), $parts[1]);
$value = $this->redis->hGet($this->getCacheName($parts[0], true), $parts[1]);
} else {
$value = $this->redis->get($this->getCacheName($cacheName));
}
Expand Down Expand Up @@ -123,7 +126,7 @@ public function set($cacheName, $value, $maxLifetime)

// check if entry is parameterized
if (isset($parts[1])) {
$key = $this->getCacheName($parts[0]);
$key = $this->getCacheName($parts[0], true);

// save parameterized cache entries as field in a hashset
// saving in a hashset is safe as the smallest lifetime of its fields is set as TTL for the whole hashset
Expand All @@ -148,7 +151,7 @@ public function set($cacheName, $value, $maxLifetime)
* @param string $cacheName
* @return string
*/
protected function getCacheName($cacheName)
protected function getCacheName($cacheName, bool $parameterized = false)
{
$flush = $this->redis->get('cache:_flush');

Expand All @@ -160,6 +163,10 @@ protected function getCacheName($cacheName)
$flush = $this->redis->get('cache:_flush');
}

if ($parameterized) {
$cacheName .= ':hset';
}

return 'cache:' . $flush . ':' . $cacheName;
}

Expand Down