Update implementation for API VM_UpdateRunTimeArgs

Signed-off-by: hwware <[email protected]>
valkey-io · Oct 31, 2024 · b4d698d · b4d698d
1 parent 811b9cc
commit b4d698d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/src/module.c b/src/module.c
@@ -3042,12 +3042,20 @@ client *moduleGetReplyClient(ValkeyModuleCtx *ctx) {
     }
 }
 
-int VM_UpdateRunTimeArgs(ValkeyModuleCtx *ctx, int index, char *value) {
+int VM_UpdateRunTimeArgs(ValkeyModuleCtx *ctx, int argc, ValkeyModuleString **argv) {
     client *c = moduleGetReplyClient(ctx);
     if (c == NULL) return VALKEYMODULE_OK;
-
-    ValkeyModuleString *o = createStringObject(value, strlen(value));
-    ctx->module->loadmod->argv[index] = o;
+    struct moduleLoadQueueEntry *loadmod = ctx->module->loadmod;
+    for (int i = 0; i < loadmod->argc; i++) {
+        decrRefCount(loadmod->argv[i]);
+    }
+    zfree(loadmod->argv);
+    loadmod->argv = argc ? zmalloc(sizeof(robj *) * argc) : NULL;
+    loadmod->argc = argc;
+    for (int i = 0; i < argc; i++) {
+        loadmod->argv[i] = argv[i];
+        incrRefCount(loadmod->argv[i]);
+    }
     return VALKEYMODULE_OK;
 }
 

diff --git a/src/valkeymodule.h b/src/valkeymodule.h
@@ -967,7 +967,7 @@ VALKEYMODULE_API void (*ValkeyModule_SetModuleAttribs)(ValkeyModuleCtx *ctx, con
     VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_IsModuleNameBusy)(const char *name) VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_WrongArity)(ValkeyModuleCtx *ctx) VALKEYMODULE_ATTR;
-VALKEYMODULE_API int (*ValkeyModule_UpdateRunTimeArgs)(ValkeyModuleCtx *ctx, int index, char *value) VALKEYMODULE_ATTR;
+VALKEYMODULE_API int (*ValkeyModule_UpdateRunTimeArgs)(ValkeyModuleCtx *ctx, int argc, ValkeyModuleString **argv) VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_ReplyWithLongLong)(ValkeyModuleCtx *ctx, long long ll) VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_GetSelectedDb)(ValkeyModuleCtx *ctx) VALKEYMODULE_ATTR;
 VALKEYMODULE_API int (*ValkeyModule_SelectDb)(ValkeyModuleCtx *ctx, int newid) VALKEYMODULE_ATTR;

diff --git a/tests/modules/moduleparameter.c b/tests/modules/moduleparameter.c
@@ -5,11 +5,8 @@
 #include <string.h>
 
 int GET_HELLO(ValkeyModuleCtx *ctx, ValkeyModuleString **argv, int argc) {
-    VALKEYMODULE_NOT_USED(argv);
-    VALKEYMODULE_NOT_USED(argc);
-
-    ValkeyModule_UpdateRunTimeArgs(ctx, 0, "99");
-    return ValkeyModule_ReplyWithSimpleString(ctx, "Module runtime args test");
+  ValkeyModule_UpdateRunTimeArgs(ctx, argc, argv);
+  return ValkeyModule_ReplyWithSimpleString(ctx, "Module runtime args test");
 }
 
 int ValkeyModule_OnLoad(ValkeyModuleCtx *ctx, ValkeyModuleString **argv, int argc) {

diff --git a/tests/unit/moduleapi/moduleconfigs.tcl b/tests/unit/moduleapi/moduleconfigs.tcl
@@ -252,8 +252,8 @@ start_server {tags {"modules"}} {
        set modulename [lmap x [r module list] {dict get $x name}]
        assert_not_equal [lsearch $modulename myhello] -1
        string match "10 20 30" [lmap x [r module list] {dict get $x args}]
-       r hello.hi
-       string match "99 20 30" [lmap x [r module list] {dict get $x args}]
+       r hello.hi 40 50 60 70
+       string match "40 50 60 70" [lmap x [r module list] {dict get $x args}]
     }
 }