From c7f74af86719f8e3f3dfd46a4a2b309c9e57244d Mon Sep 17 00:00:00 2001
From: Binbin <binloveplay1314@qq.com>
Date: Fri, 23 Aug 2024 10:43:24 +0800
Subject: [PATCH] remove do_delete arg

Signed-off-by: Binbin <binloveplay1314@qq.com>
---
 src/db.c       | 10 ++++------
 src/expire.c   |  2 +-
 src/server.h   |  2 +-
 src/t_string.c |  4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/db.c b/src/db.c
index 5a0d5458e1..0e8661f02b 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1713,12 +1713,10 @@ void deleteExpiredKeyAndPropagate(serverDb *db, robj *keyobj) {
 }
 
 /* Delete the specified expired key from overwriting and propagate the DEL or UNLINK. */
-void deleteExpiredKeyFromOverwriteAndPropagate(client *c, robj *keyobj, int do_delete) {
-    if (do_delete) {
-        int deleted = dbGenericDelete(c->db, keyobj, server.lazyfree_lazy_expire, DB_FLAG_KEY_EXPIRED);
-        serverAssertWithInfo(c, keyobj, deleted);
-        server.dirty++;
-    }
+void deleteExpiredKeyFromOverwriteAndPropagate(client *c, robj *keyobj) {
+    int deleted = dbGenericDelete(c->db, keyobj, server.lazyfree_lazy_expire, DB_FLAG_KEY_EXPIRED);
+    serverAssertWithInfo(c, keyobj, deleted);
+    server.dirty++;
 
     /* Replicate/AOF this as an explicit DEL or UNLINK. */
     robj *aux = server.lazyfree_lazy_expire ? shared.unlink : shared.del;
diff --git a/src/expire.c b/src/expire.c
index 18fda97d5c..97426e9e1a 100644
--- a/src/expire.c
+++ b/src/expire.c
@@ -668,7 +668,7 @@ void expireGenericCommand(client *c, long long basetime, int unit) {
     }
 
     if (checkAlreadyExpired(when)) {
-        deleteExpiredKeyFromOverwriteAndPropagate(c, key, 1);
+        deleteExpiredKeyFromOverwriteAndPropagate(c, key);
         addReply(c, shared.cone);
         return;
     } else {
diff --git a/src/server.h b/src/server.h
index 28d9ca6277..ba77b8b3a9 100644
--- a/src/server.h
+++ b/src/server.h
@@ -3490,7 +3490,7 @@ int setModuleNumericConfig(ModuleConfig *config, long long val, const char **err
 /* db.c -- Keyspace access API */
 int removeExpire(serverDb *db, robj *key);
 void deleteExpiredKeyAndPropagate(serverDb *db, robj *keyobj);
-void deleteExpiredKeyFromOverwriteAndPropagate(client *c, robj *keyobj, int do_delete);
+void deleteExpiredKeyFromOverwriteAndPropagate(client *c, robj *keyobj);
 void propagateDeletion(serverDb *db, robj *key, int lazy);
 int keyIsExpired(serverDb *db, robj *key);
 long long getExpire(serverDb *db, robj *key);
diff --git a/src/t_string.c b/src/t_string.c
index 021427c22e..429fdfac49 100644
--- a/src/t_string.c
+++ b/src/t_string.c
@@ -113,7 +113,7 @@ void setGenericCommand(client *c,
      * database, and then wait for the active expire to delete it, it is wasteful.
      * If the key already exists, delete it. */
     if (expire && checkAlreadyExpired(milliseconds)) {
-        if (found) deleteExpiredKeyFromOverwriteAndPropagate(c, key, 1);
+        if (found) deleteExpiredKeyFromOverwriteAndPropagate(c, key);
         if (!(flags & OBJ_SET_GET)) addReply(c, shared.ok);
         return;
     }
@@ -404,7 +404,7 @@ void getexCommand(client *c) {
     if (((flags & OBJ_PXAT) || (flags & OBJ_EXAT)) && checkAlreadyExpired(milliseconds)) {
         /* When PXAT/EXAT absolute timestamp is specified, there can be a chance that timestamp
          * has already elapsed so delete the key in that case. */
-        deleteExpiredKeyFromOverwriteAndPropagate(c, c->argv[1], 1);
+        deleteExpiredKeyFromOverwriteAndPropagate(c, c->argv[1]);
     } else if (expire) {
         setExpire(c,c->db,c->argv[1],milliseconds);
         /* Propagate as PXEXPIREAT millisecond-timestamp if there is