From e2581bf2e7df297886dd1d289d87321a7ddcd1f3 Mon Sep 17 00:00:00 2001 From: "zhaozhao.zz" Date: Mon, 11 Dec 2023 14:15:50 +0800 Subject: [PATCH] remove dead code --- src/db.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/db.c b/src/db.c index 5cf18625604..50d6bd46030 100644 --- a/src/db.c +++ b/src/db.c @@ -767,7 +767,6 @@ redisDb *initTempDb(void) { tempDb[i].dict = dictCreateMultiple(&dbDictType, tempDb[i].dict_count); tempDb[i].expires = dictCreateMultiple(&dbExpiresDictType, tempDb[i].dict_count); for (dbKeyType subdict = DB_MAIN; subdict <= DB_EXPIRES; subdict++) { - tempDb[i].sub_dict[subdict].rehashing = listCreate(); tempDb[i].sub_dict[subdict].slot_size_index = server.cluster_enabled ? zcalloc(sizeof(unsigned long long) * (CLUSTER_SLOTS + 1)) : NULL; } } @@ -789,7 +788,6 @@ void discardTempDb(redisDb *tempDb, void(callback)(dict*)) { zfree(tempDb[i].dict); zfree(tempDb[i].expires); for (dbKeyType subdict = DB_MAIN; subdict <= DB_EXPIRES; subdict++) { - listRelease(tempDb[i].sub_dict[subdict].rehashing); if (server.cluster_enabled) { zfree(tempDb[i].sub_dict[subdict].slot_size_index); } @@ -1900,7 +1898,6 @@ int dbSwapDatabases(int id1, int id2) { db1->expires_cursor = db2->expires_cursor; db1->dict_count = db2->dict_count; for (dbKeyType subdict = DB_MAIN; subdict <= DB_EXPIRES; subdict++) { - db1->sub_dict[subdict].rehashing = db2->sub_dict[subdict].rehashing; db1->sub_dict[subdict].key_count = db2->sub_dict[subdict].key_count; db1->sub_dict[subdict].bucket_count = db2->sub_dict[subdict].bucket_count; db1->sub_dict[subdict].non_empty_slots = db2->sub_dict[subdict].non_empty_slots; @@ -1914,7 +1911,6 @@ int dbSwapDatabases(int id1, int id2) { db2->expires_cursor = aux.expires_cursor; db2->dict_count = aux.dict_count; for (dbKeyType subdict = DB_MAIN; subdict <= DB_EXPIRES; subdict++) { - db2->sub_dict[subdict].rehashing = aux.sub_dict[subdict].rehashing; db2->sub_dict[subdict].key_count = aux.sub_dict[subdict].key_count; db2->sub_dict[subdict].bucket_count = aux.sub_dict[subdict].bucket_count; db2->sub_dict[subdict].non_empty_slots = aux.sub_dict[subdict].non_empty_slots; @@ -1960,7 +1956,6 @@ void swapMainDbWithTempDb(redisDb *tempDb) { activedb->expires_cursor = newdb->expires_cursor; activedb->dict_count = newdb->dict_count; for (dbKeyType subdict = DB_MAIN; subdict <= DB_EXPIRES; subdict++) { - activedb->sub_dict[subdict].rehashing = newdb->sub_dict[subdict].rehashing; activedb->sub_dict[subdict].key_count = newdb->sub_dict[subdict].key_count; activedb->sub_dict[subdict].bucket_count = newdb->sub_dict[subdict].bucket_count; activedb->sub_dict[subdict].non_empty_slots = newdb->sub_dict[subdict].non_empty_slots; @@ -1974,7 +1969,6 @@ void swapMainDbWithTempDb(redisDb *tempDb) { newdb->expires_cursor = aux.expires_cursor; newdb->dict_count = aux.dict_count; for (dbKeyType subdict = DB_MAIN; subdict <= DB_EXPIRES; subdict++) { - newdb->sub_dict[subdict].rehashing = aux.sub_dict[subdict].rehashing; newdb->sub_dict[subdict].key_count = aux.sub_dict[subdict].key_count; newdb->sub_dict[subdict].bucket_count = aux.sub_dict[subdict].bucket_count; newdb->sub_dict[subdict].non_empty_slots = aux.sub_dict[subdict].non_empty_slots;