[Cache] Use generators

nicolas-grekas · nicolas-grekas · commit a18fd51a5ca0 · 2016-01-19T12:10:48.000+01:00
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -114,7 +114,7 @@ public function getItem($key)
             $this->commit();
         }
         if (isset($this->deferred[$key])) {
-            return $this->deferred[$key];
+            return clone $this->deferred[$key];
         }
 
         $f = $this->createCacheItem;
@@ -138,38 +138,48 @@ public function getItems(array $keys = array())
         }
         $f = $this->createCacheItem;
         $ids = array();
-        $items = array();
 
         foreach ($keys as $key) {
             $id = $this->getId($key);
 
             if (isset($this->deferred[$key])) {
-                $items[$key] = $this->deferred[$key];
+                yield $key => clone $this->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);
+        foreach ($this->doFetch(array_keys($ids)) as $id => $value) {
+            if (isset($ids[$id])) {
+                yield $ids[$id] => $f($key, $value, true);
+                unset($ids[$id]);
+            }
         }
 
-        return $items;
+        foreach ($ids as $id => $key) {
+            yield $key => $f($key, null, false);
+        }
     }
 
     /**
      * {@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);
     }
 
     /**
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
`@@ -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`	`/**`