diff options
| author | Rudi Floren <rudi.floren@gmail.com> | 2022-08-01 14:52:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 15:52:40 +0300 |
| commit | 4ce3fd51b9fc6f627f4e81f1a98c8e350cc2e660 (patch) | |
| tree | 786f87b42aae044a562e2435435ad5f87c1f534d /src/commands.c | |
| parent | e13b6818742f67c515ceb98fe2fb6e587b1e2c70 (diff) | |
| download | redis-4ce3fd51b9fc6f627f4e81f1a98c8e350cc2e660.tar.gz | |
Fix wrong commands json docs for CLIENT KILL (#10970)
The docs state that there is a new and an old argument format.
The current state of the arguments allows mixing the old and new format,
thus the need for two additional oneof blocks.
One for differentiating the new from the old format and then one to
allow setting multiple filters using the new format.
Diffstat (limited to 'src/commands.c')
| -rw-r--r-- | src/commands.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/commands.c b/src/commands.c index e02a26669..3af1cd6dc 100644 --- a/src/commands.c +++ b/src/commands.c @@ -820,8 +820,8 @@ commandHistory CLIENT_KILL_History[] = { /* CLIENT KILL tips */ #define CLIENT_KILL_tips NULL -/* CLIENT KILL normal_master_slave_pubsub argument table */ -struct redisCommandArg CLIENT_KILL_normal_master_slave_pubsub_Subargs[] = { +/* CLIENT KILL filter new_format normal_master_slave_pubsub argument table */ +struct redisCommandArg CLIENT_KILL_filter_new_format_normal_master_slave_pubsub_Subargs[] = { {"normal",ARG_TYPE_PURE_TOKEN,-1,"NORMAL",NULL,NULL,CMD_ARG_NONE}, {"master",ARG_TYPE_PURE_TOKEN,-1,"MASTER",NULL,"3.2.0",CMD_ARG_NONE}, {"slave",ARG_TYPE_PURE_TOKEN,-1,"SLAVE",NULL,NULL,CMD_ARG_NONE}, @@ -830,11 +830,10 @@ struct redisCommandArg CLIENT_KILL_normal_master_slave_pubsub_Subargs[] = { {0} }; -/* CLIENT KILL argument table */ -struct redisCommandArg CLIENT_KILL_Args[] = { -{"ip:port",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_OPTIONAL}, +/* CLIENT KILL filter new_format argument table */ +struct redisCommandArg CLIENT_KILL_filter_new_format_Subargs[] = { {"client-id",ARG_TYPE_INTEGER,-1,"ID",NULL,"2.8.12",CMD_ARG_OPTIONAL}, -{"normal_master_slave_pubsub",ARG_TYPE_ONEOF,-1,"TYPE",NULL,"2.8.12",CMD_ARG_OPTIONAL,.subargs=CLIENT_KILL_normal_master_slave_pubsub_Subargs}, +{"normal_master_slave_pubsub",ARG_TYPE_ONEOF,-1,"TYPE",NULL,"2.8.12",CMD_ARG_OPTIONAL,.subargs=CLIENT_KILL_filter_new_format_normal_master_slave_pubsub_Subargs}, {"username",ARG_TYPE_STRING,-1,"USER",NULL,NULL,CMD_ARG_OPTIONAL}, {"ip:port",ARG_TYPE_STRING,-1,"ADDR",NULL,NULL,CMD_ARG_OPTIONAL}, {"ip:port",ARG_TYPE_STRING,-1,"LADDR",NULL,"6.2.0",CMD_ARG_OPTIONAL}, @@ -842,6 +841,19 @@ struct redisCommandArg CLIENT_KILL_Args[] = { {0} }; +/* CLIENT KILL filter argument table */ +struct redisCommandArg CLIENT_KILL_filter_Subargs[] = { +{"ip:port",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,.deprecated_since="2.8.12"}, +{"new-format",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_MULTIPLE,.subargs=CLIENT_KILL_filter_new_format_Subargs}, +{0} +}; + +/* CLIENT KILL argument table */ +struct redisCommandArg CLIENT_KILL_Args[] = { +{"filter",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_NONE,.subargs=CLIENT_KILL_filter_Subargs}, +{0} +}; + /********** CLIENT LIST ********************/ /* CLIENT LIST history */ |