From 9c475272da8b4a7c3bda5123f1c7412a13ba60eb Mon Sep 17 00:00:00 2001
From: Yossi Gottlieb <yossigo@gmail.com>
Date: Sun, 11 Oct 2020 18:10:55 +0300
Subject: [PATCH] Modules: fix RM_GetCommandKeys API. (#7901)

This cleans up and simplifies the API by passing the command name as the
first argument. Previously the command name was specified explicitly,
but was still included in the argv.

(cherry picked from commit 056a43e1a615080cf9ba405be0538a6a979c821e)
---
 src/module.c            | 4 ++--
 src/redismodule.h       | 2 +-
 tests/modules/getkeys.c | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/module.c b/src/module.c
index 6cbd998cb..21a603406 100644
--- a/src/module.c
+++ b/src/module.c
@@ -8012,13 +8012,13 @@ int RM_ModuleTypeReplaceValue(RedisModuleKey *key, moduleType *mt, void *new_val
  * get automatically freed even when auto-memory is used. The caller
  * must explicitly call RM_Free() to free it.
  */
-int *RM_GetCommandKeys(RedisModuleCtx *ctx, const char *cmdname, RedisModuleString **argv, int argc, int *num_keys) {
+int *RM_GetCommandKeys(RedisModuleCtx *ctx, RedisModuleString **argv, int argc, int *num_keys) {
     UNUSED(ctx);
     struct redisCommand *cmd;
     int *res = NULL;
 
     /* Find command */
-    if ((cmd = lookupCommandByCString(cmdname)) == NULL) {
+    if ((cmd = lookupCommand(argv[0]->ptr)) == NULL) {
         errno = ENOENT;
         return NULL;
     }
diff --git a/src/redismodule.h b/src/redismodule.h
index 5a46fb9ef..5da7d8658 100644
--- a/src/redismodule.h
+++ b/src/redismodule.h
@@ -760,7 +760,7 @@ REDISMODULE_API int (*RedisModule_AuthenticateClientWithACLUser)(RedisModuleCtx
 REDISMODULE_API int (*RedisModule_AuthenticateClientWithUser)(RedisModuleCtx *ctx, RedisModuleUser *user, RedisModuleUserChangedFunc callback, void *privdata, uint64_t *client_id) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_DeauthenticateAndCloseClient)(RedisModuleCtx *ctx, uint64_t client_id) REDISMODULE_ATTR;
 REDISMODULE_API RedisModuleString * (*RedisModule_GetClientCertificate)(RedisModuleCtx *ctx, uint64_t id) REDISMODULE_ATTR;
-REDISMODULE_API int *(*RedisModule_GetCommandKeys)(RedisModuleCtx *ctx, const char *cmdname, RedisModuleString **argv, int argc, int *num_keys) REDISMODULE_ATTR;
+REDISMODULE_API int *(*RedisModule_GetCommandKeys)(RedisModuleCtx *ctx, RedisModuleString **argv, int argc, int *num_keys) REDISMODULE_ATTR;
 #endif
 
 #define RedisModule_IsAOFClient(id) ((id) == CLIENT_ID_AOF)
diff --git a/tests/modules/getkeys.c b/tests/modules/getkeys.c
index 9cde606ab..706054174 100644
--- a/tests/modules/getkeys.c
+++ b/tests/modules/getkeys.c
@@ -69,11 +69,8 @@ int getkeys_introspect(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
         return REDISMODULE_OK;
     }
 
-    size_t cmd_len;
-    const char *cmd = RedisModule_StringPtrLen(argv[1], &cmd_len);
-
     int num_keys;
-    int *keyidx = RedisModule_GetCommandKeys(ctx, cmd, &argv[1], argc - 1, &num_keys);
+    int *keyidx = RedisModule_GetCommandKeys(ctx, &argv[1], argc - 1, &num_keys);
 
     if (!keyidx) {
         if (!errno)