diff options
author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2022-01-20 16:30:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-20 16:30:26 +0100 |
commit | ff809410f8e9d7ea313b0d3fc8e47460da40b8ef (patch) | |
tree | 397075fdc06d9c6b1839aa62bdf5fb2cab3ab4cd /lib | |
parent | 31af141879d46dfaf2bcbaa32c78433084645dee (diff) | |
parent | 36d7c73e693230ce001095f643013c69fbfa3c6b (diff) | |
download | nextcloud-server-ff809410f8e9d7ea313b0d3fc8e47460da40b8ef.tar.gz nextcloud-server-ff809410f8e9d7ea313b0d3fc8e47460da40b8ef.zip |
Merge pull request #30769 from nextcloud/fix/memcached_clear
Always call flush() as getAllKeys() is broken
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Memcache/Memcached.php | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php index 50f3fa66ab3..08880451a73 100644 --- a/lib/private/Memcache/Memcached.php +++ b/lib/private/Memcache/Memcached.php @@ -134,27 +134,8 @@ class Memcached extends Cache implements IMemcache { } public function clear($prefix = '') { - $prefix = $this->getNameSpace() . $prefix; - $allKeys = self::$cache->getAllKeys(); - if ($allKeys === false) { - // newer Memcached doesn't like getAllKeys(), flush everything - self::$cache->flush(); - return true; - } - $keys = []; - $prefixLength = strlen($prefix); - foreach ($allKeys as $key) { - if (substr($key, 0, $prefixLength) === $prefix) { - $keys[] = $key; - } - } - if (method_exists(self::$cache, 'deleteMulti')) { - self::$cache->deleteMulti($keys); - } else { - foreach ($keys as $key) { - self::$cache->delete($key); - } - } + // Newer Memcached doesn't like getAllKeys(), flush everything + self::$cache->flush(); return true; } |