[Cache] Allow and use generators in AbstractAdapter

nicolas-grekas · nicolas-grekas · commit fc7b4191fb4a · 2016-01-19T14:59:20.000+01:00
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -64,7 +64,7 @@ function ($deferred, $namespace) {
      *
      * @param array $ids The cache identifiers to fetch.
      *
-     * @return array The corresponding values found in the cache.
+     * @return array|\Traversable The corresponding values found in the cache.
      */
     abstract protected function doFetch(array $ids);
 
@@ -80,9 +80,11 @@ abstract protected function doHave($id);
     /**
      * Deletes all items in the pool.
      *
+     * @param string The prefix used for all identifiers managed by this pool.
+     *
      * @return bool True if the pool was successfully cleared, false otherwise.
      */
-    abstract protected function doClear();
+    abstract protected function doClear($namespace);
 
     /**
      * Removes multiple items from the pool.
@@ -114,7 +116,7 @@ public function getItem($key)
             $this->commit();
         }
         if (isset($this->deferred[$key])) {
-            return $this->deferred[$key];
+            return clone $this->deferred[$key];
         }
 
         $f = $this->createCacheItem;
@@ -136,40 +138,41 @@ public function getItems(array $keys = array())
         if ($this->deferred) {
             $this->commit();
         }
-        $f = $this->createCacheItem;
         $ids = array();
-        $items = array();
+        $deferred = array();
 
         foreach ($keys as $key) {
             $id = $this->getId($key);
 
             if (isset($this->deferred[$key])) {
-                $items[$key] = $this->deferred[$key];
+                $deferred[] = $key;
             } else {
-                $ids[$key] = $id;
+                $ids[$id] = $key;
             }
         }
 
-        $values = $this->doFetch($ids);
-
-        foreach ($ids as $key => $id) {
-            $isHit = isset($values[$id]);
-            $items[$key] = $f($key, $isHit ? $values[$id] : null, $isHit);
-        }
-
-        return $items;
+        return $this->generateItems($deferred, $ids);
     }
 
     /**
      * {@inheritdoc}
      */
     public function hasItem($key)
     {
-        if ($this->deferred) {
-            $this->commit();
+        $id = $this->getId($key);
+
+        if (isset($this->deferred[$key])) {
+            static $prefix = "\0Symfony\Component\Cache\CacheItem\0";
+            $item = (array) $this->deferred[$key];
+            $ok = $this->doSave(array($item[$prefix.'key'] => $item[$prefix.'value']), $item[$prefix.'lifetime']);
+            unset($this->deferred[$key]);
+
+            if (true === $ok || array() === $ok) {
+                return true;
+            }
         }
 
-        return $this->doHave($this->getId($key));
+        return $this->doHave($id);
     }
 
     /**
@@ -179,7 +182,7 @@ public function clear()
     {
         $this->deferred = array();
 
-        return $this->doClear();
+        return $this->doClear($this->namespace);
     }
 
     /**
@@ -289,4 +292,22 @@ private function getId($key)
 
         return $this->namespace.$key;
     }
+
+    private function generateItems($deferred, $ids)
+    {
+        foreach ($deferred as $key) {
+            yield $key => clone $this->deferred[$key];
+        }
+
+        foreach ($this->doFetch(array_keys($ids)) as $id => $value) {
+            if (isset($ids[$id])) {
+                yield $ids[$id] => $f($key, $value, true);
+                unset($ids[$id]);
+            }
+        }
+
+        foreach ($ids as $id => $key) {
+            yield $key => $f($key, null, false);
+        }
+    }
 }
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -48,7 +48,7 @@ protected function doHave($id)
     /**
      * {@inheritdoc}
      */
-    protected function doClear()
+    protected function doClear($namespace)
     {
         return apcu_clear_cache();
     }
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php
@@ -45,7 +45,7 @@ protected function doHave($id)
     /**
      * {@inheritdoc}
      */
-    protected function doClear()
+    protected function doClear($namespace)
     {
         return $this->provider->flushAll();
     }
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -57,13 +57,10 @@ public function getItem($key)
     public function getItems(array $keys = array())
     {
         $f = $this->createCacheItem;
-        $items = array();
 
         foreach ($this->pool->getItems($keys) as $key => $item) {
-            $items[$key] = $f($key, $item->get(), $item->isHit());
+            yield $key => $f($key, $item->get(), $item->isHit());
         }
-
-        return $items;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected function doHave($id)`
`48`	`48`	`/**`
`49`	`49`	`* {@inheritdoc}`
`50`	`50`	`*/`
`51`		`- protected function doClear()`
	`51`	`+ protected function doClear($namespace)`
`52`	`52`	`{`
`53`	`53`	`return apcu_clear_cache();`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function doHave($id)`
`45`	`45`	`/**`
`46`	`46`	`* {@inheritdoc}`
`47`	`47`	`*/`
`48`		`- protected function doClear()`
	`48`	`+ protected function doClear($namespace)`
`49`	`49`	`{`
`50`	`50`	`return $this->provider->flushAll();`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,10 @@ public function getItem($key)`
`57`	`57`	`public function getItems(array $keys = array())`
`58`	`58`	`{`
`59`	`59`	`$f = $this->createCacheItem;`
`60`		`- $items = array();`
`61`	`60`
`62`	`61`	`foreach ($this->pool->getItems($keys) as $key => $item) {`
`63`		`- $items[$key] = $f($key, $item->get(), $item->isHit());`
	`62`	`+ yield $key => $f($key, $item->get(), $item->isHit());`
`64`	`63`	`}`
`65`		`-`
`66`		`- return $items;`
`67`	`64`	`}`
`68`	`65`
`69`	`66`	`/**`