Reduce redis complexity

lyrixx · lyrixx · commit 6b7d0f4f1de2 · 2020-08-27T12:13:30.000+02:00
diff --git a/src/Symfony/Component/Semaphore/Store/Resources/redis_save.lua b/src/Symfony/Component/Semaphore/Store/Resources/redis_save.lua
@@ -34,8 +34,10 @@ redis.call("ZADD", timeKey, now + ttlInSecond, identifier)
 redis.call("ZADD", weightKey, weight, identifier)
 
 -- Extend the TTL
-local maxExpiration = redis.call("ZREVRANGE", timeKey, 0, 0, "WITHSCORES")[2]
-redis.call("EXPIREAT", weightKey, maxExpiration + 10)
-redis.call("EXPIREAT", timeKey, maxExpiration + 10)
+local curentTtl = redis.call("TTL", weightKey)
+if curentTtl < now + ttlInSecond then
+    redis.call("EXPIRE", weightKey, curentTtl + 10)
+    redis.call("EXPIRE", timeKey, curentTtl + 10)
+end
 
 return true
diff --git a/src/Symfony/Component/Semaphore/Store/StoreFactory.php b/src/Symfony/Component/Semaphore/Store/StoreFactory.php
@@ -29,8 +29,6 @@ class StoreFactory
 {
     /**
      * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy|string $connection Connection or DSN or Store short name
-     *
-     * @return PersistingStoreInterface
      */
     public static function createStore($connection): PersistingStoreInterface
     {

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ class StoreFactory`
`29`	`29`	`{`
`30`	`30`	`/**`
`31`	`31`	`* @param \Redis\|\RedisArray\|\RedisCluster\|\Predis\ClientInterface\|RedisProxy\|RedisClusterProxy\|string $connection Connection or DSN or Store short name`
`32`		`- *`
`33`		`- * @return PersistingStoreInterface`
`34`	`32`	`*/`
`35`	`33`	`public static function createStore($connection): PersistingStoreInterface`
`36`	`34`	`{`