test ponfee

Author: eye-gu

shenyu-plugin/shenyu-plugin-cache/shenyu-plugin-cache-handler/pom.xml

@@ -43,9 +43,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>it.ozimov</groupId>
+            <groupId>cn.ponfee</groupId>
             <artifactId>embedded-redis</artifactId>
-            <version>0.7.3</version>
+            <version>1.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

shenyu-plugin/shenyu-plugin-cache/shenyu-plugin-cache-redis/pom.xml

@@ -38,9 +38,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>it.ozimov</groupId>
+            <groupId>cn.ponfee</groupId>
             <artifactId>embedded-redis</artifactId>
-            <version>0.7.3</version>
+            <version>1.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-ratelimiter/pom.xml

@@ -25,20 +25,16 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shenyu-plugin-ratelimiter</artifactId>
 
-    <properties>
-        <embedded-redis.version>0.7.3</embedded-redis.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.shenyu</groupId>
             <artifactId>shenyu-plugin-cache-redis</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>it.ozimov</groupId>
+            <groupId>cn.ponfee</groupId>
             <artifactId>embedded-redis</artifactId>
-            <version>${embedded-redis.version}</version>
+            <version>1.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-ratelimiter/src/main/resources/META-INF/scripts/concurrent_request_rate_limiter.lua

@@ -25,7 +25,7 @@ local count = redis.call("zcard", key)
 local allowed = 0
 
 if count < capacity then
-  redis.call("zadd", key, timestamp, id)
+  redis.call("zadd", key, timestamp .. "", id)
   allowed = 1
   count = count + 1
 end

shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-ratelimiter/src/main/resources/META-INF/scripts/request_leaky_rate_limiter.lua

@@ -69,10 +69,10 @@ else
 end
 
 -- update the key bucket water yield
-redis.call("SETEX", leaky_bucket_key, key_lifetime, new_bucket_count)
+redis.call("SETEX", leaky_bucket_key, key_lifetime .. "", new_bucket_count .. "")
 
 -- update last update time
-redis.call("SETEX", last_bucket_key, key_lifetime, now)
+redis.call("SETEX", last_bucket_key, key_lifetime .. "", now .. "")
 
 -- return
 return {is_allow, new_bucket_count}

shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-ratelimiter/src/main/resources/META-INF/scripts/request_rate_limiter.lua

@@ -47,8 +47,8 @@ if allowed then
   allowed_num = 1
 end
 
-redis.call("setex", tokens_key, ttl, new_tokens)
-redis.call("setex", timestamp_key, ttl, now)
+redis.call("setex", tokens_key, ttl .. "", new_tokens .. "")
+redis.call("setex", timestamp_key, ttl .. "", now .. "")
 
 return { allowed_num, new_tokens }
 

shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-ratelimiter/src/main/resources/META-INF/scripts/sliding_window_request_rate_limiter.lua

@@ -42,14 +42,14 @@ local remain_request = capacity - last_requested
 local allowed_num = 0
 if (last_requested < capacity) then
     allowed_num = 1
-    redis.call('zadd', tokens_key, now, timestamp_key)
+    redis.call('zadd', tokens_key, now .. "", timestamp_key)
 end
 
 --redis.log(redis.LOG_WARNING, "remain_request " .. remain_request)
 --redis.log(redis.LOG_WARNING, "allowed_num " .. allowed_num)
 
 redis.call('zremrangebyscore', tokens_key, 0, now - window_size / window_time)
-redis.call('expire', tokens_key, math.ceil(window_size))
+redis.call('expire', tokens_key, math.ceil(window_size) .. "")
 
 return { allowed_num, remain_request }