[Cache] Make RetryProxyAdapter TagAwaare

sbelyshkin · sbelyshkin · commit face50d3924c · 2021-09-13T02:47:57.000+07:00
diff --git a/src/Symfony/Component/Cache/Adapter/RedisEphemeralTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisEphemeralTagAwareAdapter.php
@@ -32,6 +32,8 @@
  * It's not the case when all reads and writes go to a master node(s). Adapter doesn't change the source for reads,
  * it's your responsibility to configure redis client according to your needs.
  *
+ * Hint: RetryProxyAdapter::class can help to mitigate mentioned replication lag issues as well as cache stampedes.
+ *
  * @requires Redis 2.6.12+
  *
  * @author Sergey Belyshkin <sbelyshkin@gmail.com>
diff --git a/src/Symfony/Component/Cache/Adapter/RetryProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/RetryProxyAdapter.php
@@ -37,7 +37,7 @@
  *
  * @author Sergey Belyshkin <sbelyshkin@gmail.com>
  */
-class RetryProxyAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, PruneableInterface, ResettableInterface
+class RetryProxyAdapter implements TagAwareAdapterInterface, CacheInterface, LoggerAwareInterface, PruneableInterface, ResettableInterface
 {
     use ContractsTrait;
     use LoggerAwareTrait;
@@ -136,6 +136,18 @@ public function __construct(CacheItemPoolInterface $pool, int $timeout = 10000,
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function invalidateTags(array $tags)
+    {
+        if ($this->pool instanceof TagAwareAdapterInterface) {
+            return $this->pool->invalidateTags($tags);
+        }
+
+        return false;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -151,7 +163,7 @@ public function clear(string $prefix = '')
     /**
      * {@inheritdoc}
      */
-    public function commit()
+    public function commit(): bool
     {
         return $this->pool->commit();
     }
@@ -175,15 +187,15 @@ public function deleteItems(array $keys): bool
     /**
      * {@inheritdoc}
      */
-    public function hasItem($key)
+    public function hasItem($key): bool
     {
         return $this->pool->hasItem($key);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function save(CacheItemInterface $item)
+    public function save(CacheItemInterface $item): bool
     {
         return $this->pool->save($item);
     }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`* It's not the case when all reads and writes go to a master node(s). Adapter doesn't change the source for reads,`
`33`	`33`	`* it's your responsibility to configure redis client according to your needs.`
`34`	`34`	`*`
	`35`	`+ * Hint: RetryProxyAdapter::class can help to mitigate mentioned replication lag issues as well as cache stampedes.`
	`36`	`+ *`
`35`	`37`	`* @requires Redis 2.6.12+`
`36`	`38`	`*`
`37`	`39`	`* @author Sergey Belyshkin <sbelyshkin@gmail.com>`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`* @author Sergey Belyshkin <sbelyshkin@gmail.com>`
`39`	`39`	`*/`
`40`		`-class RetryProxyAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, PruneableInterface, ResettableInterface`
	`40`	`+class RetryProxyAdapter implements TagAwareAdapterInterface, CacheInterface, LoggerAwareInterface, PruneableInterface, ResettableInterface`
`41`	`41`	`{`
`42`	`42`	`use ContractsTrait;`
`43`	`43`	`use LoggerAwareTrait;`
`@@ -136,6 +136,18 @@ public function __construct(CacheItemPoolInterface $pool, int $timeout = 10000,`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
	`139`	`+ /**`
	`140`	`+ * {@inheritdoc}`
	`141`	`+ */`
	`142`	`+ public function invalidateTags(array $tags)`
	`143`	`+ {`
	`144`	`+ if ($this->pool instanceof TagAwareAdapterInterface) {`
	`145`	`+ return $this->pool->invalidateTags($tags);`
	`146`	`+ }`
	`147`	`+`
	`148`	`+ return false;`
	`149`	`+ }`
	`150`	`+`
`139`	`151`	`/**`
`140`	`152`	`* {@inheritdoc}`
`141`	`153`	`*/`
`@@ -151,7 +163,7 @@ public function clear(string $prefix = '')`
`151`	`163`	`/**`
`152`	`164`	`* {@inheritdoc}`
`153`	`165`	`*/`
`154`		`- public function commit()`
	`166`	`+ public function commit(): bool`
`155`	`167`	`{`
`156`	`168`	`return $this->pool->commit();`
`157`	`169`	`}`
`@@ -175,15 +187,15 @@ public function deleteItems(array $keys): bool`
`175`	`187`	`/**`
`176`	`188`	`* {@inheritdoc}`
`177`	`189`	`*/`
`178`		`- public function hasItem($key)`
	`190`	`+ public function hasItem($key): bool`
`179`	`191`	`{`
`180`	`192`	`return $this->pool->hasItem($key);`
`181`	`193`	`}`
`182`	`194`
`183`	`195`	`/**`
`184`	`196`	`* {@inheritdoc}`
`185`	`197`	`*/`
`186`		`- public function save(CacheItemInterface $item)`
	`198`	`+ public function save(CacheItemInterface $item): bool`
`187`	`199`	`{`
`188`	`200`	`return $this->pool->save($item);`
`189`	`201`	`}`