Added Unittests for cache

[friendica.git] / src / Core / Cache / RedisCacheDriver.php

diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
index fa98842da0e686f39ad4b862a50898fd873bfadb..223c2b8a943493b146ef2983af7bace20dd0dbcf 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,10 +10,10 @@ use Friendica\Core\Cache;
  * @author Hypolite Petovan <mrpetovan@gmail.com>
  * @author Roland Haeder <roland@mxchange.org>
  */
-class RedisCacheDriver extends BaseObject implements ICacheDriver
+class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
        /**
-        * @var Redis
+        * @var \Redis
         */
        private $redis;
 
@@ -34,16 +33,14 @@ class RedisCacheDriver extends BaseObject implements ICacheDriver
        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);
-
-               // @see http://php.net/manual/en/redis.get.php#84275
-               if (is_bool($cached) || is_double($cached) || is_long($cached)) {
-                       return $return;
+               $cached = $this->redis->get($cachekey);
+               if ($cached === false && !$this->redis->exists($cachekey)) {
+                       return null;
                }
 
-               $value = @unserialize($cached);
+               $value = json_decode($cached);
 
                // Only return a value if the serialized value is valid.
                // We also check if the db entry is a serialized
@@ -55,23 +52,94 @@ class RedisCacheDriver extends BaseObject implements ICacheDriver
                return $return;
        }
 
-       public function set($key, $value, $duration = Cache::MONTH)
+       public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
-               // We store with the hostname as key to avoid problems with other applications
-               return $this->redis->set(
-                       self::getApp()->get_hostname() . ":" . $key,
-                       serialize($value),
-                       time() + $duration
-               );
+               $cachekey = $this->getCacheKey($key);
+
+               $cached = json_encode($value);
+
+               if ($ttl > 0) {
+                       return $this->redis->setex(
+                               $cachekey,
+                               $ttl,
+                               $cached
+                       );
+               } else {
+                       return $this->redis->set(
+                               $cachekey,
+                               $cached
+                       );
+               }
        }
 
        public function delete($key)
        {
-               return $this->redis->delete($key);
+               $cachekey = $this->getCacheKey($key);
+               return ($this->redis->delete($cachekey) > 0);
        }
 
-       public function clear()
+       public function clear($outdated = true)
        {
-               return true;
+               if ($outdated) {
+                       return true;
+               } else {
+                       return $this->redis->flushAll();
+               }
+       }
+
+       /**
+        * (@inheritdoc)
+        */
+       public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
+       {
+               $cachekey = $this->getCacheKey($key);
+               $cached = json_encode($value);
+
+               return $this->redis->setnx($cachekey, $cached);
+       }
+
+       /**
+        * (@inheritdoc)
+        */
+       public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES)
+       {
+               $cachekey = $this->getCacheKey($key);
+
+               $newCached = json_encode($newValue);
+
+               $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 ($ttl > 0) {
+                               $result = $this->redis->multi()
+                                       ->setex($cachekey, $ttl, $newCached)
+                                       ->exec();
+                       } else {
+                               $result = $this->redis->multi()
+                                       ->set($cachekey, $newValue)
+                                       ->exec();
+                       }
+                       return $result !== false;
+               }
+               $this->redis->unwatch();
+               return false;
+       }
+       /**
+        * (@inheritdoc)
+        */
+       public function compareDelete($key, $value)
+       {
+               $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($cachekey)
+                               ->exec();
+                       return $result !== false;
+               }
+               $this->redis->unwatch();
+               return false;
        }
 }