diff options
| author | guybe7 <guy.benoish@redislabs.com> | 2022-08-18 15:09:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-18 15:09:36 +0300 |
| commit | 223046ec9a25c1021f8d89a7edd1c4e4ff2c9ad9 (patch) | |
| tree | 9b426ce705ccdb166a46982cdd8d771f127a97e4 /tests/modules | |
| parent | fc3956e8f4d35ea66967bb26f26175ad184f8978 (diff) | |
| download | redis-223046ec9a25c1021f8d89a7edd1c4e4ff2c9ad9.tar.gz | |
Repurpose redisCommandArg's name as the unique ID (#11051)
This PR makes sure that "name" is unique for all arguments in the same
level (i.e. all args of a command and all args within a block/oneof).
This means several argument with identical meaning can be referred to together,
but also if someone needs to refer to a specific one, they can use its full path.
In addition, the "display_text" field has been added, to be used by redis.io
in order to render the syntax of the command (for the vast majority it is
identical to "name" but sometimes we want to use a different string
that is not "name")
The "display" field is exposed via COMMAND DOCS and will be present
for every argument, except "oneof" and "block" (which are container
arguments)
Other changes:
1. Make sure we do not have any container arguments ("oneof" or "block")
that contain less than two sub-args (otherwise it doesn't make sense)
2. migrate.json: both AUTH and AUTH2 should not be "optional"
3. arg names cannot contain underscores, and force the usage of hyphens
(most of these were a result of the script that generated the initial json files
from redis.io commands.json).
Diffstat (limited to 'tests/modules')
| -rw-r--r-- | tests/modules/cmdintrospection.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/modules/cmdintrospection.c b/tests/modules/cmdintrospection.c index aba817e14..dd9fb7f60 100644 --- a/tests/modules/cmdintrospection.c +++ b/tests/modules/cmdintrospection.c @@ -104,6 +104,7 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { .name = "threshold", .type = REDISMODULE_ARG_TYPE_STRING, + .display_text = "threshold" /* Just for coverage, doesn't have a visible effect */ }, { .name = "count", @@ -116,11 +117,11 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) } }, { - .name = "id_or_auto", + .name = "id-selector", .type = REDISMODULE_ARG_TYPE_ONEOF, .subargs = (RedisModuleCommandArg[]){ { - .name = "auto_id", + .name = "auto-id", .type = REDISMODULE_ARG_TYPE_PURE_TOKEN, .token = "*" }, @@ -132,7 +133,7 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) } }, { - .name = "field_value", + .name = "data", .type = REDISMODULE_ARG_TYPE_BLOCK, .flags = REDISMODULE_CMD_ARG_MULTIPLE, .subargs = (RedisModuleCommandArg[]){ |