remove do_delete arg

Signed-off-by: Binbin <[email protected]>

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;

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 {

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);

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