[Cache] Commit items implicitly only when deferred keys are requested

sbelyshkin · sbelyshkin · commit aa2ff9d249e8 · 2021-10-04T13:16:46.000+07:00
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -157,7 +157,8 @@ public function invalidateTags(array $tags)
      */
     public function hasItem($key)
     {
-        if ($this->deferred) {
+        CacheItem::validateKey($key));
+        if (isset($this->deferred[$key])) {
             $this->commit();
         }
         if (!$this->pool->hasItem($key)) {
@@ -200,9 +201,6 @@ public function getItem($key)
      */
     public function getItems(array $keys = [])
     {
-        if ($this->deferred) {
-            $this->commit();
-        }
         $tagKeys = [];
 
         foreach ($keys as $key) {
@@ -212,6 +210,10 @@ public function getItems(array $keys = [])
             }
         }
 
+        if ($this->deferred && (count($tagKeys) !== count($keys) || array_intersect_key($this->deferred, array_flip($keys)))) {
+            $this->commit();
+        }
+
         try {
             $items = $this->pool->getItems($tagKeys + $keys);
         } catch (InvalidArgumentException $e) {
diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -208,10 +208,11 @@ public function deleteItems(array $keys)
      */
     public function getItem($key)
     {
-        if ($this->deferred) {
+        $id = $this->getId($key);
+
+        if (isset($this->deferred[$key])) {
             $this->commit();
         }
-        $id = $this->getId($key);
 
         $isHit = false;
         $value = null;
@@ -234,21 +235,22 @@ public function getItem($key)
      */
     public function getItems(array $keys = [])
     {
-        if ($this->deferred) {
-            $this->commit();
-        }
         $ids = [];
-
         foreach ($keys as $key) {
-            $ids[] = $this->getId($key);
+            $ids[$key] = $this->getId($key);
         }
+
+        if ($this->deferred && array_intersect_key($this->deferred, $ids)) {
+            $this->commit();
+        }
+
         try {
             $items = $this->doFetch($ids);
         } catch (\Exception $e) {
             CacheItem::log($this->logger, 'Failed to fetch items: '.$e->getMessage(), ['keys' => $keys, 'exception' => $e, 'cache-adapter' => get_debug_type($this)]);
             $items = [];
         }
-        $ids = array_combine($ids, $keys);
+        $ids = array_flip($ids);
 
         return $this->generateItems($items, $ids);
     }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,8 @@ public function invalidateTags(array $tags)`
`157`	`157`	`*/`
`158`	`158`	`public function hasItem($key)`
`159`	`159`	`{`
`160`		`- if ($this->deferred) {`
	`160`	`+ CacheItem::validateKey($key));`
	`161`	`+ if (isset($this->deferred[$key])) {`
`161`	`162`	`$this->commit();`
`162`	`163`	`}`
`163`	`164`	`if (!$this->pool->hasItem($key)) {`
`@@ -200,9 +201,6 @@ public function getItem($key)`
`200`	`201`	`*/`
`201`	`202`	`public function getItems(array $keys = [])`
`202`	`203`	`{`
`203`		`- if ($this->deferred) {`
`204`		`- $this->commit();`
`205`		`- }`
`206`	`204`	`$tagKeys = [];`
`207`	`205`
`208`	`206`	`foreach ($keys as $key) {`
`@@ -212,6 +210,10 @@ public function getItems(array $keys = [])`
`212`	`210`	`}`
`213`	`211`	`}`
`214`	`212`
	`213`	`+ if ($this->deferred && (count($tagKeys) !== count($keys) \|\| array_intersect_key($this->deferred, array_flip($keys)))) {`
	`214`	`+ $this->commit();`
	`215`	`+ }`
	`216`	`+`
`215`	`217`	`try {`
`216`	`218`	`$items = $this->pool->getItems($tagKeys + $keys);`
`217`	`219`	`} catch (InvalidArgumentException $e) {`