Refactor dict restoring abstraction

Signed-off-by: Jim Brunner <brunnerj@amazon.com>

Author: JimB123

src/Makefile

@@ -498,6 +498,7 @@ ENGINE_SERVER_OBJ = \
     db.o \
     debug.o \
     defrag.o \
+	dict_ht.o \
     entry.o \
     eval.o \
     evict.o \
@@ -594,6 +595,7 @@ ENGINE_CLI_OBJ = \
     crc64.o \
     crccombine.o \
     crcspeed.o \
+	dict_ht.o \
     hashtable.o \
     monotonic.o \
     mt19937-64.o \
@@ -618,6 +620,7 @@ ENGINE_BENCHMARK_OBJ = \
     crc64.o \
     crccombine.o \
     crcspeed.o \
+	dict_ht.o \
     fuzzer_client.o \
     fuzzer_command_generator.o \
     hashtable.o \

src/cluster_legacy.c

@@ -247,7 +247,6 @@ static_assert(offsetof(clusterMsg, type) + sizeof(uint16_t) == RCVBUF_MIN_READ_L
 /* Cluster nodes hash table, mapping nodes addresses 1.2.3.4:6379 to
  * clusterNode structures. */
 dictType clusterNodesDictType = {
-    .entryGetKey = dictEntryGetKey,
     .hashFunction = dictSdsHash,
     .keyCompare = dictSdsKeyCompare,
     .entryDestructor = dictEntryDestructorSdsKey,
@@ -257,15 +256,13 @@ dictType clusterNodesDictType = {
  * we can re-add this node. The goal is to avoid reading a removed
  * node for some time. */
 dictType clusterNodesBlackListDictType = {
-    .entryGetKey = dictEntryGetKey,
     .hashFunction = dictSdsCaseHash,
     .keyCompare = dictSdsKeyCaseCompare,
     .entryDestructor = dictEntryDestructorSdsKey,
 };
 
 /* Cluster shards hash table, mapping shard id to list of nodes */
 dictType clusterSdsToListType = {
-    .entryGetKey = dictEntryGetKey,
     .hashFunction = dictSdsHash,
     .keyCompare = dictSdsKeyCompare,
     .entryDestructor = dictEntryDestructorSdsKeyListValue,
@@ -283,7 +280,6 @@ static int dictPtrCompare(const void *key1, const void *key2) {
 /* Dictionary type for mapping hash slots to cluster nodes.
  * Keys are slot numbers encoded directly as pointer values, values are clusterNode pointers. */
 dictType clusterSlotDictType = {
-    .entryGetKey = dictEntryGetKey,
     .hashFunction = dictPtrHash,
     .keyCompare = dictPtrCompare,
     .entryDestructor = zfree,

src/config.c

@@ -1047,14 +1047,12 @@ void rewriteConfigSentinelOption(struct rewriteConfigState *state);
  * like "maxmemory" -> list of line numbers (first line is zero).
  */
 dictType optionToLineDictType = {
-    .entryGetKey = dictEntryGetKey,
     .hashFunction = dictSdsCaseHash,
     .keyCompare = dictSdsKeyCaseCompare,
     .entryDestructor = dictEntryDestructorSdsKeyListValue,
 };
 
 dictType optionSetDictType = {
-    .entryGetKey = dictEntryGetKey,
     .hashFunction = dictSdsCaseHash,
     .keyCompare = dictSdsKeyCaseCompare,
     .entryDestructor = dictEntryDestructorSdsKey,

src/defrag.c

@@ -299,41 +299,18 @@ static void activeDefragZsetNode(void *privdata, void *entry_ref) {
 #define DEFRAG_SDS_DICT_VAL_VOID_PTR 3
 #define DEFRAG_SDS_DICT_VAL_LUA_SCRIPT 4
 
-typedef void *(dictDefragAllocFunction)(void *ptr);
-typedef struct {
-    dictDefragAllocFunction *defragKey;
-    dictDefragAllocFunction *defragVal;
-} dictDefragFunctions;
 
 static void activeDefragDictCallback(void *privdata, void *entry_ref) {
     dictDefragFunctions *defragfns = privdata;
     dictEntry **de_ref = (dictEntry **)entry_ref;
-    dictEntry *de = *de_ref;
-
-    /* Defrag the entry itself */
-    dictEntry *newentry = activeDefragAlloc(de);
-    if (newentry) {
-        de = newentry;
-        *de_ref = newentry;
-    }
-
-    /* Defrag the key */
-    if (defragfns->defragKey) {
-        void *newkey = defragfns->defragKey(de->key);
-        if (newkey) de->key = newkey;
-    }
-
-    /* Defrag the value */
-    if (defragfns->defragVal) {
-        void *newval = defragfns->defragVal(de->v.val);
-        if (newval) de->v.val = newval;
-    }
+    htdictDefragEntry(de_ref, defragfns);
 }
 
 /* Defrag a dict with sds key and optional value (either ptr, sds or robj string) */
 static void activeDefragSdsDict(dict *d, int val_type) {
     unsigned long cursor = 0;
     dictDefragFunctions defragfns = {
+        .defragAlloc = activeDefragAlloc,
         .defragKey = (dictDefragAllocFunction *)activeDefragSds,
         .defragVal = (val_type == DEFRAG_SDS_DICT_VAL_IS_SDS       ? (dictDefragAllocFunction *)activeDefragSds
                       : val_type == DEFRAG_SDS_DICT_VAL_IS_STROB   ? (dictDefragAllocFunction *)activeDefragStringOb