Review fixes

MeirShpilraien · Sep 2, 2024 · b1db05e · b1db05e
1 parent 2beccc8
commit b1db05e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/src/defrag.c b/src/defrag.c
@@ -1089,6 +1089,7 @@ void activeDefragCycle(void) {
             slot = -1;
             defrag_later_item_in_progress = 0;
             db = NULL;
+            moduleDefragEnd();
             goto update_metrics;
         }
         return;

diff --git a/src/module.c b/src/module.c
@@ -13453,21 +13453,13 @@ int RM_RegisterDefragFunc(RedisModuleCtx *ctx, RedisModuleDefragFunc cb) {
     return REDISMODULE_OK;
 }
 
-/* Register a defrag callback that will be called when defrag operation starts.
+/* Register a defrag callbacks that will be called when defrag operation starts and ends.
  *
- * The callback supports anything as on `RM_RegisterDefragFunc` but the user
- * can also assume the callback is called when the defrag operation starts. */
-int RM_RegisterDefragStartFunc(RedisModuleCtx *ctx, RedisModuleDefragFunc cb) {
-    ctx->module->defrag_start_cb = cb;
-    return REDISMODULE_OK;
-}
-
-/* Register a defrag callback that will be called when defrag operation ends.
- *
- * The callback supports anything as on `RM_RegisterDefragFunc` but the user
- * can also assume the callback is called when the defrag operation ends. */
-int RM_RegisterDefragEndFunc(RedisModuleCtx *ctx, RedisModuleDefragFunc cb) {
-    ctx->module->defrag_end_cb = cb;
+ * The callbacks are the same as `RM_RegisterDefragFunc` but the user
+ * can also assume the callbacks are called when the defrag operation starts and ends. */
+int RM_RegisterDefragCallbacks(RedisModuleCtx *ctx, RedisModuleDefragFunc start, RedisModuleDefragFunc end) {
+    ctx->module->defrag_start_cb = start;
+    ctx->module->defrag_end_cb = end;
     return REDISMODULE_OK;
 }
 
@@ -14051,8 +14043,7 @@ void moduleRegisterCoreAPI(void) {
     REGISTER_API(GetCurrentCommandName);
     REGISTER_API(GetTypeMethodVersion);
     REGISTER_API(RegisterDefragFunc);
-    REGISTER_API(RegisterDefragStartFunc);
-    REGISTER_API(RegisterDefragEndFunc);
+    REGISTER_API(RegisterDefragCallbacks);
     REGISTER_API(DefragAlloc);
     REGISTER_API(DefragAllocRaw);
     REGISTER_API(DefragFreeRaw);

diff --git a/src/redismodule.h b/src/redismodule.h
@@ -1296,8 +1296,7 @@ REDISMODULE_API int *(*RedisModule_GetCommandKeys)(RedisModuleCtx *ctx, RedisMod
 REDISMODULE_API int *(*RedisModule_GetCommandKeysWithFlags)(RedisModuleCtx *ctx, RedisModuleString **argv, int argc, int *num_keys, int **out_flags) REDISMODULE_ATTR;
 REDISMODULE_API const char *(*RedisModule_GetCurrentCommandName)(RedisModuleCtx *ctx) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_RegisterDefragFunc)(RedisModuleCtx *ctx, RedisModuleDefragFunc func) REDISMODULE_ATTR;
-REDISMODULE_API int (*RedisModule_RegisterDefragStartFunc)(RedisModuleCtx *ctx, RedisModuleDefragFunc func) REDISMODULE_ATTR;
-REDISMODULE_API int (*RedisModule_RegisterDefragEndFunc)(RedisModuleCtx *ctx, RedisModuleDefragFunc func) REDISMODULE_ATTR;
+REDISMODULE_API int (*RedisModule_RegisterDefragCallbacks)(RedisModuleCtx *ctx, RedisModuleDefragFunc start, RedisModuleDefragFunc end) REDISMODULE_ATTR;
 REDISMODULE_API void *(*RedisModule_DefragAlloc)(RedisModuleDefragCtx *ctx, void *ptr) REDISMODULE_ATTR;
 REDISMODULE_API void *(*RedisModule_DefragAllocRaw)(RedisModuleDefragCtx *ctx, size_t size) REDISMODULE_ATTR;
 REDISMODULE_API void (*RedisModule_DefragFreeRaw)(RedisModuleDefragCtx *ctx, void *ptr) REDISMODULE_ATTR;
@@ -1666,8 +1665,7 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int
     REDISMODULE_GET_API(GetCommandKeysWithFlags);
     REDISMODULE_GET_API(GetCurrentCommandName);
     REDISMODULE_GET_API(RegisterDefragFunc);
-    REDISMODULE_GET_API(RegisterDefragStartFunc);
-    REDISMODULE_GET_API(RegisterDefragEndFunc);
+    REDISMODULE_GET_API(RegisterDefragCallbacks);
     REDISMODULE_GET_API(DefragAlloc);
     REDISMODULE_GET_API(DefragAllocRaw);
     REDISMODULE_GET_API(DefragFreeRaw);

diff --git a/tests/modules/defragtest.c b/tests/modules/defragtest.c
@@ -258,8 +258,7 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
 
     RedisModule_RegisterInfoFunc(ctx, FragInfo);
     RedisModule_RegisterDefragFunc(ctx, defragGlobalStrings);
-    RedisModule_RegisterDefragStartFunc(ctx, defragStart);
-    RedisModule_RegisterDefragEndFunc(ctx, defragEnd);
+    RedisModule_RegisterDefragCallbacks(ctx, defragStart, defragEnd);
 
     return REDISMODULE_OK;
 }