Unverified Commit 58edea73 authored by debing.sun's avatar debing.sun Committed by GitHub
Browse files

Add help for `DEBUG SCRIPT` command (#13385)

1. Add help for `DEBUG SCRIPT` command.
2. Remove a duplicate `getLuaScripts()` which is same as
`evalScriptsDict()`.
parent 26a2dcb9
...@@ -482,6 +482,8 @@ void debugCommand(client *c) { ...@@ -482,6 +482,8 @@ void debugCommand(client *c) {
" Enable or disable the reply buffer resize cron job", " Enable or disable the reply buffer resize cron job",
"DICT-RESIZING <0|1>", "DICT-RESIZING <0|1>",
" Enable or disable the main dict and expire dict resizing.", " Enable or disable the main dict and expire dict resizing.",
"SCRIPT <LIST|<sha>>",
" Output SHA and content of all scripts or of a specific script with its SHA.",
NULL NULL
}; };
addExtendedReplyHelp(c, help, clusterDebugCommandExtendedHelp()); addExtendedReplyHelp(c, help, clusterDebugCommandExtendedHelp());
...@@ -1016,7 +1018,7 @@ NULL ...@@ -1016,7 +1018,7 @@ NULL
addReply(c, shared.ok); addReply(c, shared.ok);
} else if (!strcasecmp(c->argv[1]->ptr,"script") && c->argc == 3) { } else if (!strcasecmp(c->argv[1]->ptr,"script") && c->argc == 3) {
if (!strcasecmp(c->argv[2]->ptr,"list")) { if (!strcasecmp(c->argv[2]->ptr,"list")) {
dictIterator *di = dictGetIterator(getLuaScripts()); dictIterator *di = dictGetIterator(evalScriptsDict());
dictEntry *de; dictEntry *de;
while ((de = dictNext(di)) != NULL) { while ((de = dictNext(di)) != NULL) {
luaScript *script = dictGetVal(de); luaScript *script = dictGetVal(de);
...@@ -1026,7 +1028,7 @@ NULL ...@@ -1026,7 +1028,7 @@ NULL
dictReleaseIterator(di); dictReleaseIterator(di);
} else if (sdslen(c->argv[2]->ptr) == 40) { } else if (sdslen(c->argv[2]->ptr) == 40) {
dictEntry *de; dictEntry *de;
if ((de = dictFind(getLuaScripts(), c->argv[2]->ptr)) == NULL) { if ((de = dictFind(evalScriptsDict(), c->argv[2]->ptr)) == NULL) {
addReplyErrorObject(c, shared.noscripterr); addReplyErrorObject(c, shared.noscripterr);
return; return;
} }
......
...@@ -1737,7 +1737,3 @@ void luaLdbLineHook(lua_State *lua, lua_Debug *ar) { ...@@ -1737,7 +1737,3 @@ void luaLdbLineHook(lua_State *lua, lua_Debug *ar) {
rctx->start_time = getMonotonicUs(); rctx->start_time = getMonotonicUs();
} }
} }
dict *getLuaScripts(void) {
return lctx.lua_scripts;
}
...@@ -74,7 +74,6 @@ extern scriptFlag scripts_flags_def[]; ...@@ -74,7 +74,6 @@ extern scriptFlag scripts_flags_def[];
void luaEnvInit(void); void luaEnvInit(void);
lua_State *createLuaState(void); lua_State *createLuaState(void);
dict *getLuaScripts(void);
uint64_t scriptFlagsToCmdFlags(uint64_t cmd_flags, uint64_t script_flags); uint64_t scriptFlagsToCmdFlags(uint64_t cmd_flags, uint64_t script_flags);
int scriptPrepareForRun(scriptRunCtx *r_ctx, client *engine_client, client *caller, const char *funcname, uint64_t script_flags, int ro); int scriptPrepareForRun(scriptRunCtx *r_ctx, client *engine_client, client *caller, const char *funcname, uint64_t script_flags, int ro);
void scriptResetRun(scriptRunCtx *r_ctx); void scriptResetRun(scriptRunCtx *r_ctx);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment