Use hash tags for keys

Author: cristipufu

src/RedisRateLimiting/Concurrency/RedisConcurrencyManager.cs

@@ -86,7 +86,7 @@ internal class RedisConcurrencyManager
             then
                 redis.call(""hincrby"", @stats_key, 'total_successful', 1)
             else
-                if queued == false
+                if queued == false and try_enqueue == 1
                 then
                     redis.call(""hincrby"", @stats_key, 'total_failed', 1)
                 end
@@ -109,9 +109,9 @@ public RedisConcurrencyManager(
             _options = options;
             _connectionMultiplexer = options.ConnectionMultiplexerFactory!.Invoke();
 
-            RateLimitKey = new RedisKey($"rl:{partitionKey}");
-            QueueRateLimitKey = new RedisKey($"rl:{partitionKey}:q");
-            StatsRateLimitKey = new RedisKey($"rl:{partitionKey}:stats");
+            RateLimitKey = new RedisKey($"rl:{{{partitionKey}}}");
+            QueueRateLimitKey = new RedisKey($"rl:{{{partitionKey}}}:q");
+            StatsRateLimitKey = new RedisKey($"rl:{{{partitionKey}}}:stats");
         }
 
         internal async Task<RedisConcurrencyResponse> TryAcquireLeaseAsync(string requestId, bool tryEnqueue = false)

src/RedisRateLimiting/FixedWindow/RedisFixedWindowManager.cs

@@ -42,8 +42,8 @@ public RedisFixedWindowManager(
             _options = options;
             _connectionMultiplexer = options.ConnectionMultiplexerFactory!.Invoke();
 
-            RateLimitKey = new RedisKey($"rl:{partitionKey}");
-            RateLimitExpireKey = new RedisKey($"rl:{partitionKey}:exp");
+            RateLimitKey = new RedisKey($"rl:{{{partitionKey}}}");
+            RateLimitExpireKey = new RedisKey($"rl:{{{partitionKey}}}:exp");
         }
 
         internal async Task<RedisFixedWindowResponse> TryAcquireLeaseAsync()

src/RedisRateLimiting/RedisRateLimiting.csproj

@@ -14,7 +14,7 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/cristipufu/aspnetcore-redis-rate-limiting</RepositoryUrl>
-		<Version>1.0.9</Version>
+		<Version>1.0.10</Version>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 	</PropertyGroup>
 

src/RedisRateLimiting/SlidingWindow/RedisSlidingWindowManager.cs

@@ -37,7 +37,7 @@ public RedisSlidingWindowManager(
             _options = options;
             _connectionMultiplexer = options.ConnectionMultiplexerFactory!.Invoke();
 
-            RateLimitKey = new RedisKey($"rl:{partitionKey}");
+            RateLimitKey = new RedisKey($"rl:{{{partitionKey}}}");
         }
 
         internal async Task<RedisSlidingWindowResponse> TryAcquireLeaseAsync(string requestId)

src/RedisRateLimiting/TokenBucket/RedisTokenBucketManager.cs

@@ -9,6 +9,7 @@ internal class RedisTokenBucketManager
         private readonly IConnectionMultiplexer _connectionMultiplexer;
         private readonly RedisTokenBucketRateLimiterOptions _options;
         private readonly RedisKey RateLimitKey;
+        private readonly RedisKey RateLimitTimestampKey;
 
         private static readonly LuaScript _redisScript = LuaScript.Prepare(
           @"local rate = tonumber(@tokens_per_period)
@@ -22,8 +23,7 @@ internal class RedisTokenBucketManager
               current_tokens = limit
             end
 
-            local timestamp_key = @rate_limit_key .. "":ts""
-            local last_refreshed = tonumber(redis.call(""get"", timestamp_key))
+            local last_refreshed = tonumber(redis.call(""get"", @timestamp_key))
             if last_refreshed == nil then
               last_refreshed = 0
             end
@@ -41,7 +41,7 @@ internal class RedisTokenBucketManager
             local ttl = math.floor(fill_time * 2)
 
             redis.call(""setex"", @rate_limit_key, ttl, current_tokens)
-            redis.call(""setex"", timestamp_key, ttl, now)
+            redis.call(""setex"", @timestamp_key, ttl, now)
 
             return { allowed, current_tokens }");
 
@@ -52,7 +52,8 @@ public RedisTokenBucketManager(
             _options = options;
             _connectionMultiplexer = options.ConnectionMultiplexerFactory!.Invoke();
 
-            RateLimitKey = new RedisKey($"rl:{partitionKey}");
+            RateLimitKey = new RedisKey($"rl:{{{partitionKey}}}");
+            RateLimitTimestampKey = new RedisKey($"rl:{{{partitionKey}}}:ts");
         }
 
         internal async Task<RedisTokenBucketResponse> TryAcquireLeaseAsync()
@@ -67,6 +68,7 @@ internal async Task<RedisTokenBucketResponse> TryAcquireLeaseAsync()
                 new
                 {
                     rate_limit_key = RateLimitKey,
+                    timestamp_key = RateLimitTimestampKey,
                     current_time = nowUnixTimeSeconds,
                     tokens_per_period = _options.TokensPerPeriod,
                     token_limit = _options.TokenLimit,
@@ -97,6 +99,7 @@ internal RedisTokenBucketResponse TryAcquireLease()
                 new
                 {
                     rate_limit_key = RateLimitKey,
+                    timestamp_key = RateLimitTimestampKey,
                     current_time = nowUnixTimeSeconds,
                     tokens_per_period = _options.TokensPerPeriod,
                     token_limit = _options.TokenLimit,

test/RedisRateLimiting.Tests/UnitTests/ConcurrencyUnitTests.cs

@@ -190,6 +190,8 @@ public async Task QueueAvailableAfterQueueLimitHitAndResourcesBecomeAvailable()
             var lease = limiter.AttemptAcquire();
             var wait = limiter.AcquireAsync();
 
+            await Task.Delay(1000);
+
             var failedLease = await limiter.AcquireAsync();
             Assert.False(failedLease.IsAcquired);
 

test/RedisRateLimiting.Tests/UnitTests/TestFixture.cs

@@ -25,7 +25,7 @@ public TestFixture()
 
         public async Task ClearStatisticsAsync(string partitionKey)
         {
-            var key = $"rl:{partitionKey}:stats";
+            var key = $"rl:{{{partitionKey}}}:stats";
             var database = ConnectionMultiplexer.GetDatabase();
             await database.KeyDeleteAsync(key);
         }