Bugfixings for Cache-Lock

- used wrong cachekey in set
- therefore added an abstraction to avoid wrong key concatenation
- forgot to increase the db-version to 1275

diff --git a/boot.php b/boot.php
index a4588b3f737178e44cb03ec1de317c5e5d6ecf7c..249fd9a891808ce44bfdff716d982ee3aaf99ff1 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
 define('FRIENDICA_VERSION',      '2018.08-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1274);
+define('DB_UPDATE_VERSION',      1275);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**

diff --git a/src/Core/Cache/AbstractCacheDriver.php b/src/Core/Cache/AbstractCacheDriver.php
new file mode 100644 (file)
index 0000000..6974dff
--- /dev/null
+++ b/src/Core/Cache/AbstractCacheDriver.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Friendica\Core\Cache;
+use Friendica\BaseObject;
+
+
+/**
+ * Abstract class for common used functions
+ *
+ * Class AbstractCacheDriver
+ *
+ * @package Friendica\Core\Cache
+ */
+abstract class AbstractCacheDriver extends BaseObject implements IMemoryCacheDriver
+{
+       /**
+        * @param string $key   The original key
+        * @return string               The cache key used for the cache
+        */
+       protected function getCacheKey($key) {
+               return self::getApp()->get_hostname() . ":" . $key;
+       }
+}
\ No newline at end of file

diff --git a/src/Core/Cache/ArrayCache.php b/src/Core/Cache/ArrayCache.php
index 71610c39dfab80e90aefdb96341ca49751d57db3..714021c7239257a1ed5754641abc181cb0aaf98e 100644 (file)
--- a/src/Core/Cache/ArrayCache.php
+++ b/src/Core/Cache/ArrayCache.php
@@ -12,7 +12,7 @@ use Friendica\Core\Cache;
  *
  * @package Friendica\Core\Cache
  */
-class ArrayCache implements IMemoryCacheDriver
+class ArrayCache extends AbstractCacheDriver
 {
        use TraitCompareDelete;
 

diff --git a/src/Core/Cache/MemcacheCacheDriver.php b/src/Core/Cache/MemcacheCacheDriver.php
index 8eb45d907ea45cb42e36e349f921193e03a214ff..9c16d55312ce0a1aad1d9d5775e1fba3fd9850d9 100644 (file)
--- a/src/Core/Cache/MemcacheCacheDriver.php
+++ b/src/Core/Cache/MemcacheCacheDriver.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Core\Cache;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 
 /**
@@ -10,7 +9,7 @@ use Friendica\Core\Cache;
  *
  * @author Hypolite Petovan <mrpetovan@gmail.com>
  */
-class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
+class MemcacheCacheDriver extends AbstractCacheDriver
 {
        use TraitCompareSet;
        use TraitCompareDelete;
@@ -39,9 +38,10 @@ class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
        public function get($key)
        {
                $return = null;
+               $cachekey = $this->getCacheKey($key);
 
                // We fetch with the hostname as key to avoid problems with other applications
-               $cached = $this->memcache->get(self::getApp()->get_hostname() . ':' . $key);
+               $cached = $this->memcache->get($cachekey);
 
                // @see http://php.net/manual/en/memcache.get.php#84275
                if (is_bool($cached) || is_double($cached) || is_long($cached)) {
@@ -65,17 +65,19 @@ class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
+               $cachekey = $this->getCacheKey($key);
+
                // We store with the hostname as key to avoid problems with other applications
                if ($ttl > 0) {
                        return $this->memcache->set(
-                               self::getApp()->get_hostname() . ":" . $key,
+                               $cachekey,
                                serialize($value),
                                MEMCACHE_COMPRESSED,
                                time() + $ttl
                        );
                } else {
                        return $this->memcache->set(
-                               self::getApp()->get_hostname() . ":" . $key,
+                               $cachekey,
                                serialize($value),
                                MEMCACHE_COMPRESSED
                        );
@@ -87,7 +89,8 @@ class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function delete($key)
        {
-               return $this->memcache->delete($key);
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcache->delete($cachekey);
        }
 
        /**
@@ -103,6 +106,7 @@ class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
-               return $this->memcache->add(self::getApp()->get_hostname() . ":" . $key, $value, $ttl);
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcache->add($cachekey, $value, $ttl);
        }
 }

diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php
index dda36ba19cd584572acd35ef9480a4bad4172457..52b6a08cf10642f53fb9ca985d03d7f733580164 100644 (file)
--- a/src/Core/Cache/MemcachedCacheDriver.php
+++ b/src/Core/Cache/MemcachedCacheDriver.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Core\Cache;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 
 /**
@@ -10,7 +9,7 @@ use Friendica\Core\Cache;
  *
  * @author Hypolite Petovan <mrpetovan@gmail.com>
  */
-class MemcachedCacheDriver extends BaseObject implements IMemoryCacheDriver
+class MemcachedCacheDriver extends AbstractCacheDriver
 {
        use TraitCompareSet;
        use TraitCompareDelete;
@@ -38,9 +37,10 @@ class MemcachedCacheDriver extends BaseObject implements IMemoryCacheDriver
        public function get($key)
        {
                $return = null;
+               $cachekey = $this->getCacheKey($key);
 
                // We fetch with the hostname as key to avoid problems with other applications
-               $value = $this->memcached->get(self::getApp()->get_hostname() . ':' . $key);
+               $value = $this->memcached->get($cachekey);
 
                if ($this->memcached->getResultCode() === \Memcached::RES_SUCCESS) {
                        $return = $value;
@@ -51,16 +51,18 @@ class MemcachedCacheDriver extends BaseObject implements IMemoryCacheDriver
 
        public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
+               $cachekey = $this->getCacheKey($key);
+
                // We store with the hostname as key to avoid problems with other applications
                if ($ttl > 0) {
                        return $this->memcached->set(
-                               self::getApp()->get_hostname() . ':' . $key,
+                               $cachekey,
                                $value,
                                time() + $ttl
                        );
                } else {
                        return $this->memcached->set(
-                               self::getApp()->get_hostname() . ':' . $key,
+                               $cachekey,
                                $value
                        );
                }
@@ -69,9 +71,8 @@ class MemcachedCacheDriver extends BaseObject implements IMemoryCacheDriver
 
        public function delete($key)
        {
-               $return = $this->memcached->delete(self::getApp()->get_hostname() . ':' . $key);
-
-               return $return;
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcached->delete($cachekey);
        }
 
        public function clear()
@@ -89,6 +90,7 @@ class MemcachedCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
-               return $this->memcached->add(self::getApp()->get_hostname() . ":" . $key, $value, $ttl);
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcached->add($cachekey, $value, $ttl);
        }
 }

diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
index 735418b2d220d8414d5fa48a341c2f047fd3bf8e..8f85e67d7863ae55bb8fd7bba5e4caa947d113cf 100644 (file)
--- a/src/Core/Cache/RedisCacheDriver.php
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Core\Cache;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 
 /**
@@ -11,7 +10,7 @@ use Friendica\Core\Cache;
  * @author Hypolite Petovan <mrpetovan@gmail.com>
  * @author Roland Haeder <roland@mxchange.org>
  */
-class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
+class RedisCacheDriver extends AbstractCacheDriver
 {
        /**
         * @var \Redis
@@ -34,9 +33,10 @@ class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
        public function get($key)
        {
                $return = null;
+               $cachekey = $this->getCacheKey($key);
 
                // We fetch with the hostname as key to avoid problems with other applications
-               $cached = $this->redis->get(self::getApp()->get_hostname() . ':' . $key);
+               $cached = $this->redis->get($cachekey);
 
                // @see http://php.net/manual/en/redis.get.php#84275
                if (is_bool($cached) || is_double($cached) || is_long($cached)) {
@@ -57,16 +57,18 @@ class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
 
        public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
+               $cachekey = $this->getCacheKey($key);
+
                // We store with the hostname as key to avoid problems with other applications
                if ($ttl > 0) {
                        return $this->redis->setex(
-                               self::getApp()->get_hostname() . ":" . $key,
+                               $cachekey,
                                time() + $ttl,
                                serialize($value)
                        );
                } else {
                        return $this->redis->set(
-                               self::getApp()->get_hostname() . ":" . $key,
+                               $cachekey,
                                serialize($value)
                        );
                }
@@ -88,11 +90,13 @@ class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
+               $cachekey = $this->getCacheKey($key);
+
                if (!is_int($value)) {
                        $value = serialize($value);
                }
 
-               return $this->redis->setnx(self::getApp()->get_hostname() . ":" . $key, $value);
+               return $this->redis->setnx($cachekey, $value);
        }
 
        /**
@@ -100,20 +104,22 @@ class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES)
        {
+               $cachekey = $this->getCacheKey($key);
+
                if (!is_int($newValue)) {
                        $newValue = serialize($newValue);
                }
 
-               $this->redis->watch(self::getApp()->get_hostname() . ":" . $key);
+               $this->redis->watch($cachekey);
                // If the old value isn't what we expected, somebody else changed the key meanwhile
-               if ($this->get($key) === $oldValue) {
+               if ($this->get($cachekey) === $oldValue) {
                        if ($ttl > 0) {
                                $result = $this->redis->multi()
-                                       ->setex(self::getApp()->get_hostname() . ":" . $ttl, $key, $newValue)
+                                       ->setex($cachekey, $ttl, $newValue)
                                        ->exec();
                        } else {
                                $result = $this->redis->multi()
-                                       ->set(self::getApp()->get_hostname() . ":" . $key, $newValue)
+                                       ->set($cachekey, $newValue)
                                        ->exec();
                        }
                        return $result !== false;
@@ -126,11 +132,13 @@ class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function compareDelete($key, $value)
        {
-               $this->redis->watch(self::getApp()->get_hostname() . ":" . $key);
+               $cachekey = $this->getCacheKey($key);
+
+               $this->redis->watch($cachekey);
                // If the old value isn't what we expected, somebody else changed the key meanwhile
                if ($this->get($key) === $value) {
                        $result = $this->redis->multi()
-                               ->del(self::getApp()->get_hostname() . ":" . $key)
+                               ->del($cachekey)
                                ->exec();
                        return $result !== false;
                }

diff --git a/src/Core/Lock/CacheLockDriver.php b/src/Core/Lock/CacheLockDriver.php
index 2dd6f3fad9defd290ca4c1fc7c90215d7607ee04..ccbbb8a350da26b8b0589ea5510930d21c988602 100644 (file)
--- a/src/Core/Lock/CacheLockDriver.php
+++ b/src/Core/Lock/CacheLockDriver.php
@@ -29,7 +29,7 @@ class CacheLockDriver extends AbstractLockDriver
                $got_lock = false;
                $start = time();
 
-               $cachekey = self::getCacheKey($key);
+               $cachekey = self::getLockKey($key);
 
                do {
                        $lock = $this->cache->get($cachekey);
@@ -62,7 +62,7 @@ class CacheLockDriver extends AbstractLockDriver
         */
        public function releaseLock($key)
        {
-               $cachekey = self::getCacheKey($key);
+               $cachekey = self::getLockKey($key);
 
                $this->cache->compareDelete($cachekey, getmypid());
                $this->markRelease($key);
@@ -73,7 +73,7 @@ class CacheLockDriver extends AbstractLockDriver
         */
        public function isLocked($key)
        {
-               $cachekey = self::getCacheKey($key);
+               $cachekey = self::getLockKey($key);
                $lock = $this->cache->get($cachekey);
                return isset($lock) && ($lock !== false);
        }
@@ -82,7 +82,7 @@ class CacheLockDriver extends AbstractLockDriver
         * @param string $key   The original key
         * @return string               The cache key used for the cache
         */
-       private static function getCacheKey($key) {
-               return self::getApp()->get_hostname() . ";lock:" . $key;
+       private static function getLockKey($key) {
+               return "lock:" . $key;
        }
 }