summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfengweihao <[email protected]>2023-02-06 10:52:45 +0800
committerfengweihao <[email protected]>2023-02-06 10:52:45 +0800
commit7d218feded47faae71785b76fcc84667a6288abe (patch)
tree1497c8df96c1792f9bb832c6efeb4733ff52674f
parent383436fbe5aa4bd387a06c5655b686db390458be (diff)
bugfix: Optimize token accumulation time, Fix the REPLY_INT_MINORS1 assignment error
-rw-r--r--CRDT/oc_token_bucket.c6
-rw-r--r--src/swarmkv.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/CRDT/oc_token_bucket.c b/CRDT/oc_token_bucket.c
index 80d389d..f4ffd4e 100644
--- a/CRDT/oc_token_bucket.c
+++ b/CRDT/oc_token_bucket.c
@@ -59,10 +59,10 @@ long long OC_token_bucket_control(struct OC_token_bucket *bucket, struct timeval
assert(refilled>=0);
assert(consumed>=0);
int refill_flag=0;
-
- if(delta_time_ms>=bucket->cfg.refill_duration_ms)
+
+ to_add=bucket->cfg.CIR*delta_time_ms/1000;
+ if(delta_time_ms>=bucket->cfg.refill_duration_ms && to_add>0)
{
- to_add=bucket->cfg.CIR*delta_time_ms/1000;
if(refilled<consumed)
{
refilled=consumed;
diff --git a/src/swarmkv.c b/src/swarmkv.c
index 3ed3e9f..011282b 100644
--- a/src/swarmkv.c
+++ b/src/swarmkv.c
@@ -580,7 +580,7 @@ static struct swarmkv_reply *keyroute_fail_reply(enum cmd_keyroute_failover fail
reply=swarmkv_reply_new_integer(0);
break;
case REPLY_INT_MINORS1:
- reply=swarmkv_reply_new_integer(0);
+ reply=swarmkv_reply_new_integer(-1);
break;
case REPLY_NIL:
reply=swarmkv_reply_new_nil();