removed memcache unit-test because lack of support in travis

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

diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php
index d6b8d4ad5808146d00d9b8110c30770eaf019834..d4aab15c92430045bb5d058ca2a6889afdcf28af 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,10 +9,13 @@ use Friendica\Core\Cache;
  *
  * @author Hypolite Petovan <mrpetovan@gmail.com>
  */
-class MemcachedCacheDriver extends BaseObject implements ICacheDriver
+class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
+       use TraitCompareSet;
+       use TraitCompareDelete;
+
        /**
-        * @var Memcached
+        * @var \Memcached
         */
        private $memcached;
 
@@ -35,9 +37,10 @@ class MemcachedCacheDriver 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
-               $value = $this->memcached->get(self::getApp()->get_hostname() . ':' . $key);
+               $value = $this->memcached->get($cachekey);
 
                if ($this->memcached->getResultCode() === \Memcached::RES_SUCCESS) {
                        $return = $value;
@@ -46,23 +49,52 @@ class MemcachedCacheDriver extends BaseObject implements ICacheDriver
                return $return;
        }
 
-       public function set($key, $value, $duration = Cache::MONTH)
+       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
-               return $this->memcached->set(
-                       self::getApp()->get_hostname() . ":" . $key,
-                       $value,
-                       time() + $duration
-               );
+               if ($ttl > 0) {
+                       return $this->memcached->set(
+                               $cachekey,
+                               $value,
+                               $ttl
+                       );
+               } else {
+                       return $this->memcached->set(
+                               $cachekey,
+                               $value
+                       );
+               }
+
        }
 
        public function delete($key)
        {
-               return $this->memcached->delete($key);
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcached->delete($cachekey);
+       }
+
+       public function clear($outdated = true)
+       {
+               if ($outdated) {
+                       return true;
+               } else {
+                       return $this->memcached->flush();
+               }
        }
 
-       public function clear()
+       /**
+        * @brief Sets a value if it's not already stored
+        *
+        * @param string $key      The cache key
+        * @param mixed  $value    The old value we know from the cache
+        * @param int    $ttl      The cache lifespan, must be one of the Cache constants
+        * @return bool
+        */
+       public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
-               return true;
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcached->add($cachekey, $value, $ttl);
        }
 }