From 4a2e021e9ec40e220f12cc095b12ca71d7ee95d0 Mon Sep 17 00:00:00 2001 From: "debing.sun" Date: Tue, 5 Aug 2025 22:09:25 +0800 Subject: [PATCH 1/2] Enforce token presence for multiple_token in json schema --- src/redis-cli.c | 1 + utils/generate-command-code.py | 1 + 2 files changed, 2 insertions(+) diff --git a/src/redis-cli.c b/src/redis-cli.c index f6086a857..754c44fef 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -1163,6 +1163,7 @@ static sds addHintForRepeatedArgument(sds hint, cliCommandArg *arg) { hint = sdscat(hint, "["); if (arg->flags & CMD_ARG_MULTIPLE_TOKEN) { + assert(arg->token); hint = sdscat_orempty(hint, arg->token); if (arg->type != ARG_TYPE_PURE_TOKEN) { hint = sdscat(hint, " "); diff --git a/utils/generate-command-code.py b/utils/generate-command-code.py index 76c8c3b15..04b4d3150 100755 --- a/utils/generate-command-code.py +++ b/utils/generate-command-code.py @@ -207,6 +207,7 @@ class Argument(object): s += "CMD_ARG_MULTIPLE|" if self.desc.get("multiple_token", False): assert self.desc.get("multiple", False) # Sanity + assert self.desc.get("token", None) s += "CMD_ARG_MULTIPLE_TOKEN|" return s[:-1] if s else "CMD_ARG_NONE" From d95dfcc8c3b9d41a55d69b3cbcd3aee239c5d5b0 Mon Sep 17 00:00:00 2001 From: "debing.sun" Date: Tue, 5 Aug 2025 22:40:48 +0800 Subject: [PATCH 2/2] Update utils/generate-command-code.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- utils/generate-command-code.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/generate-command-code.py b/utils/generate-command-code.py index 04b4d3150..d9826aabd 100755 --- a/utils/generate-command-code.py +++ b/utils/generate-command-code.py @@ -207,7 +207,7 @@ class Argument(object): s += "CMD_ARG_MULTIPLE|" if self.desc.get("multiple_token", False): assert self.desc.get("multiple", False) # Sanity - assert self.desc.get("token", None) + assert "token" in self.desc s += "CMD_ARG_MULTIPLE_TOKEN|" return s[:-1] if s else "CMD_ARG_NONE"