Rely on HoldString where possible

Author: lantiga

opt/readies

@@ -5,6 +5,7 @@ endif()
 ADD_LIBRARY(redisai_obj OBJECT
         util/dict.c
         util/queue.c
+        util/string_utils.c
         redisai.c
         run_info.c
         background_workers.c

src/CMakeLists.txt

@@ -43,6 +43,7 @@
 #include "util/arr_rm_alloc.h"
 #include "util/dict.h"
 #include "util/queue.h"
+#include "util/string_utils.h"
 
 /**
  * Execution of a TENSORSET DAG step.
@@ -703,7 +704,7 @@ int RedisAI_DagRun_Reply(RedisModuleCtx *ctx, RedisModuleString **argv, int argc
                 RedisModule_StringPtrLen(persist_key_name, &persist_key_len);
             RedisModuleString *demangled_key_name =
                 RedisModule_CreateString(NULL, persist_key_str, persist_key_len - 4);
-            RedisModule_RetainString(NULL, demangled_key_name);
+            demangled_key_name = RAI_HoldString(NULL, demangled_key_name);
             const int status = RAI_OpenKey_Tensor(ctx, demangled_key_name, &key,
                                                   REDISMODULE_READ | REDISMODULE_WRITE);
             if (status == REDISMODULE_ERR) {

src/dag.c

@@ -17,6 +17,7 @@
 #include "stats.h"
 #include "util/arr_rm_alloc.h"
 #include "util/dict.h"
+#include "util/string_utils.h"
 #include <pthread.h>
 
 RedisModuleType *RedisAI_ModelType = NULL;
@@ -113,10 +114,7 @@ static void *RAI_Model_RdbLoad(struct RedisModuleIO *io, int encver) {
     RedisModuleString *stats_keystr =
         RedisModule_CreateStringFromString(stats_ctx, RedisModule_GetKeyNameFromIO(io));
     const char *stats_devicestr = RedisModule_Strdup(devicestr);
-    if (tag) {
-        RedisModule_RetainString(NULL, tag);
-    }
-    RedisModuleString *stats_tag = tag;
+    RedisModuleString *stats_tag = RAI_HoldString(NULL, tag);
 
     model->infokey =
         RAI_AddStatsEntry(stats_ctx, stats_keystr, RAI_MODEL, backend, stats_devicestr, stats_tag);
@@ -325,8 +323,7 @@ RAI_Model *RAI_ModelCreate(RAI_Backend backend, const char *devicestr, RedisModu
 
     if (model) {
         if (tag) {
-            RedisModule_RetainString(NULL, tag);
-            model->tag = tag;
+            model->tag = RAI_HoldString(NULL, tag);
         } else {
             model->tag = RedisModule_CreateString(NULL, "", 0);
         }
@@ -596,12 +593,12 @@ int RedisAI_Parse_ModelRun_RedisCommand(RedisModuleCtx *ctx, RedisModuleString *
             is_input = 1;
             outputs_flag_count = 1;
         } else {
-            RedisModule_RetainString(ctx, argv[argpos]);
+            RedisModuleString *arg = RAI_HoldString(ctx, argv[argpos]);
             if (is_input == 0) {
-                *inkeys = array_append(*inkeys, argv[argpos]);
+                *inkeys = array_append(*inkeys, arg);
                 ninputs++;
             } else {
-                *outkeys = array_append(*outkeys, argv[argpos]);
+                *outkeys = array_append(*outkeys, arg);
                 noutputs++;
             }
         }

src/model.c

@@ -13,6 +13,7 @@
 #include "script_struct.h"
 #include "stats.h"
 #include "util/arr_rm_alloc.h"
+#include "util/string_utils.h"
 #include "version.h"
 #include <pthread.h>
 
@@ -59,9 +60,7 @@ static void *RAI_Script_RdbLoad(struct RedisModuleIO *io, int encver) {
         RedisModule_CreateStringFromString(stats_ctx, RedisModule_GetKeyNameFromIO(io));
     const char *stats_devicestr = RedisModule_Strdup(devicestr);
 
-    if (tag) {
-        RedisModule_RetainString(NULL, tag);
-    }
+    tag = RAI_HoldString(NULL, tag);
 
     script->infokey = RAI_AddStatsEntry(stats_ctx, stats_keystr, RAI_SCRIPT, RAI_BACKEND_TORCH,
                                         stats_devicestr, tag);
@@ -120,8 +119,7 @@ RAI_Script *RAI_ScriptCreate(const char *devicestr, RedisModuleString *tag, cons
 
     if (script) {
         if (tag) {
-            RedisModule_RetainString(NULL, tag);
-            script->tag = tag;
+            script->tag = RAI_HoldString(NULL, tag);
         } else {
             script->tag = RedisModule_CreateString(NULL, "", 0);
         }

src/script.c

@@ -8,6 +8,7 @@
  */
 
 #include "stats.h"
+#include "util/string_utils.h"
 
 #include <sys/time.h>
 
@@ -27,15 +28,11 @@ void *RAI_AddStatsEntry(RedisModuleCtx *ctx, RedisModuleString *key, RAI_RunType
                         RAI_Backend backend, const char *devicestr, RedisModuleString *tag) {
     struct RedisAI_RunStats *rstats = NULL;
     rstats = RedisModule_Calloc(1, sizeof(struct RedisAI_RunStats));
-    RedisModule_RetainString(ctx, key);
-    rstats->key = key;
+    rstats->key = RAI_HoldString(NULL, key);
     rstats->type = runtype;
     rstats->backend = backend;
     rstats->devicestr = RedisModule_Strdup(devicestr);
-    if (tag) {
-        RedisModule_RetainString(ctx, tag);
-    }
-    rstats->tag = tag;
+    rstats->tag = RAI_HoldString(NULL, tag);
 
     AI_dictAdd(run_stats, (void *)key, (void *)rstats);
 

src/stats.c

@@ -0,0 +1,15 @@
+#include "string_utils.h"
+
+RedisModuleString *RAI_HoldString(RedisModuleCtx *ctx, RedisModuleString *str) {
+    if (str == NULL) {
+        return NULL;
+    }
+    RedisModuleString *out;
+    if (RMAPI_FUNC_SUPPORTED(RedisModule_HoldString)) {
+        out = RedisModule_HoldString(NULL, str);
+    } else {
+        RedisModule_RetainString(NULL, str);
+        out = str;
+    }
+    return out;
+}

src/util/string_utils.c

@@ -0,0 +1,3 @@
+#include "redismodule.h"
+
+RedisModuleString *RAI_HoldString(RedisModuleCtx *ctx, RedisModuleString *str);