Merge branch 'valkey-io:unstable' into slot_migration

valkey-io · Apr 6, 2024 · 70213a7 · 70213a7
2 parents a6891f4 + 717ec1e
commit 70213a7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/module.c b/src/module.c
@@ -13556,7 +13556,7 @@ void *VM_DefragAlloc(ValkeyModuleDefragCtx *ctx, void *ptr) {
  * by the module, will end up with a single reference (because the reference
  * on the Redis side is dropped as soon as the command callback returns).
  */
-ValkeyModuleString *VM_DefragModuleString(ValkeyModuleDefragCtx *ctx, ValkeyModuleString *str) {
+ValkeyModuleString *VM_DefragValkeyModuleString(ValkeyModuleDefragCtx *ctx, ValkeyModuleString *str) {
     UNUSED(ctx);
     return activeDefragStringOb(str);
 }
@@ -13998,7 +13998,7 @@ void moduleRegisterCoreAPI(void) {
     REGISTER_API(GetTypeMethodVersion);
     REGISTER_API(RegisterDefragFunc);
     REGISTER_API(DefragAlloc);
-    REGISTER_API(DefragModuleString);
+    REGISTER_API(DefragValkeyModuleString);
     REGISTER_API(DefragShouldStop);
     REGISTER_API(DefragCursorSet);
     REGISTER_API(DefragCursorGet);

diff --git a/src/redismodule.h b/src/redismodule.h
@@ -680,7 +680,7 @@
 #define RedisModule_GetCurrentCommandName ValkeyModule_GetCurrentCommandName
 #define RedisModule_RegisterDefragFunc ValkeyModule_RegisterDefragFunc
 #define RedisModule_DefragAlloc ValkeyModule_DefragAlloc
-#define RedisModule_DefragRedisModuleString ValkeyModule_DefragModuleString
+#define RedisModule_DefragRedisModuleString ValkeyModule_DefragValkeyModuleString
 #define RedisModule_DefragShouldStop ValkeyModule_DefragShouldStop
 #define RedisModule_DefragCursorSet ValkeyModule_DefragCursorSet
 #define RedisModule_DefragCursorGet ValkeyModule_DefragCursorGet

diff --git a/src/valkeymodule.h b/src/valkeymodule.h
@@ -4,7 +4,7 @@
  * This header file is forked from redismodule.h to reflect the new naming conventions adopted in Valkey.
  * 
  * Key Changes:
- * - Symbolic names have been changed from VALKEYMODULE_* to VALKEYMODULE_* to align with the
+ * - Symbolic names have been changed from containing RedisModule, REDISMODULE, etc. to ValkeyModule, VALKEYMODULE, etc. to align with the
  *   new module naming convention. Developers must use these new symbolic names in their module
  *   implementations.
  * - Terminology has been updated to be more inclusive: "slave" is now "replica", and "master" 
@@ -1300,7 +1300,7 @@ VALKEYMODULE_API int *(*ValkeyModule_GetCommandKeysWithFlags)(ValkeyModuleCtx *c
 VALKEYMODULE_API const char *(*ValkeyModule_GetCurrentCommandName)(ValkeyModuleCtx *ctx) VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_RegisterDefragFunc)(ValkeyModuleCtx *ctx, ValkeyModuleDefragFunc func) VALKEYMODULE_ATTR;
 VALKEYMODULE_API void *(*ValkeyModule_DefragAlloc)(ValkeyModuleDefragCtx *ctx, void *ptr) VALKEYMODULE_ATTR;
-VALKEYMODULE_API ValkeyModuleString *(*ValkeyModule_DefragModuleString)(ValkeyModuleDefragCtx *ctx, ValkeyModuleString *str) VALKEYMODULE_ATTR;
+VALKEYMODULE_API ValkeyModuleString *(*ValkeyModule_DefragValkeyModuleString)(ValkeyModuleDefragCtx *ctx, ValkeyModuleString *str) VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_DefragShouldStop)(ValkeyModuleDefragCtx *ctx) VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_DefragCursorSet)(ValkeyModuleDefragCtx *ctx, unsigned long cursor) VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_DefragCursorGet)(ValkeyModuleDefragCtx *ctx, unsigned long *cursor) VALKEYMODULE_ATTR;
@@ -1666,7 +1666,7 @@ static int ValkeyModule_Init(ValkeyModuleCtx *ctx, const char *name, int ver, in
     VALKEYMODULE_GET_API(GetCurrentCommandName);
     VALKEYMODULE_GET_API(RegisterDefragFunc);
     VALKEYMODULE_GET_API(DefragAlloc);
-    VALKEYMODULE_GET_API(DefragModuleString);
+    VALKEYMODULE_GET_API(DefragValkeyModuleString);
     VALKEYMODULE_GET_API(DefragShouldStop);
     VALKEYMODULE_GET_API(DefragCursorSet);
     VALKEYMODULE_GET_API(DefragCursorGet);