Making cache tags more efficient by rewriting the API.

Related to php-cache/issues#21

Author: Nyholm

PredisCachePool.php

@@ -14,14 +14,18 @@
 use Cache\Adapter\Common\AbstractCachePool;
 use Cache\Hierarchy\HierarchicalCachePoolTrait;
 use Cache\Hierarchy\HierarchicalPoolInterface;
+use Cache\Taggable\TaggableItemInterface;
+use Cache\Taggable\TaggablePoolInterface;
+use Cache\Taggable\TaggablePoolTrait;
 use Predis\Client;
 use Psr\Cache\CacheItemInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class PredisCachePool extends AbstractCachePool implements HierarchicalPoolInterface
+class PredisCachePool extends AbstractCachePool implements HierarchicalPoolInterface, TaggablePoolInterface
 {
+    use TaggablePoolTrait;
     use HierarchicalCachePoolTrait;
 
     /**
@@ -37,10 +41,19 @@ public function __construct(Client $cache)
         $this->cache = $cache;
     }
 
+    public function save(CacheItemInterface $item)
+    {
+        if ($item instanceof TaggableItemInterface) {
+            $this->saveTags($item);
+        }
+
+        return parent::save($item);
+    }
+
     protected function fetchObjectFromCache($key)
     {
         if (false === $result = unserialize($this->cache->get($this->getHierarchyKey($key)))) {
-            return [false, null];
+            return [false, null, []];
         }
 
         return $result;
@@ -56,23 +69,24 @@ protected function clearOneObjectFromCache($key)
         // We have to commit here to be able to remove deferred hierarchy items
         $this->commit();
 
+        $this->preRemoveItem($key);
         $keyString = $this->getHierarchyKey($key, $path);
         $this->cache->incr($path);
         $this->clearHierarchyKeyCache();
 
         return $this->cache->del($keyString) >= 0;
     }
 
-    protected function storeItemInCache($key, CacheItemInterface $item, $ttl)
+    protected function storeItemInCache(CacheItemInterface $item, $ttl)
     {
         if ($ttl < 0) {
             return false;
         }
 
-        $key  = $this->getHierarchyKey($key);
-        $data = serialize([true, $item->get()]);
+        $key  = $this->getHierarchyKey($item->getKey());
+        $data = serialize([true, $item->get(), $item->getTags()]);
 
-        if ($ttl === null) {
+        if ($ttl === null || $ttl === 0) {
             return 'OK' === $this->cache->set($key, $data)->getPayload();
         }
 
@@ -83,4 +97,24 @@ protected function getValueFormStore($key)
     {
         return $this->cache->get($key);
     }
+
+    protected function appendListItem($name, $value)
+    {
+        $this->cache->lpush($name, $value);
+    }
+
+    protected function getList($name)
+    {
+        return $this->cache->lrange($name, 0, -1);
+    }
+
+    protected function removeList($name)
+    {
+        return $this->cache->del($name);
+    }
+
+    protected function removeListItem($name, $key)
+    {
+        return $this->cache->lrem($name, 0, $key);
+    }
 }

composer.json

@@ -34,7 +34,7 @@
     },
     "require-dev":       {
         "phpunit/phpunit":         "^4.0|^5.1",
-        "cache/integration-tests": "0.7.0"
+        "cache/integration-tests": "0.9.0"
     },
     "provide":           {
         "psr/cache-implementation": "^1.0"