gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add redis-cli hints to ACL DRYRUN, COMMAND GETKEYS, COMMAND GETKEYSANDFLAGS (#11232)

Browse Source 
Better redis-cli hints for commands that take other commands as arguments.

```
command getkeysandflags hello [protover [AUTH username password]]
acl dryrun user hello [protover [AUTH username password]]
```
This commit is contained in:
Huang Zhw 2022-09-29 14:49:53 +08:00 committed by GitHub
parent e21c059967
commit f8e2279e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/redis-cli.c
View File

@ -943,7 +943,7 @@ static void completionCallback(const char *buf, linenoiseCompletions *lc) {
static char *hintsCallback(const char *buf, int *color, int *bold) { static char *hintsCallback(const char *buf, int *color, int *bold) {
if (!pref.hints) return NULL; if (!pref.hints) return NULL;
int i, rawargc, argc, buflen = strlen(buf), matchlen = 0; int i, rawargc, argc, buflen = strlen(buf), matchlen = 0, shift = 0;
sds *rawargv, *argv = sdssplitargs(buf,&argc); sds *rawargv, *argv = sdssplitargs(buf,&argc);
int endspace = buflen && isspace(buf[buflen-1]); int endspace = buflen && isspace(buf[buflen-1]);
helpEntry *entry = NULL; helpEntry *entry = NULL;
@ -954,6 +954,16 @@ static char *hintsCallback(const char *buf, int *color, int *bold) {
return NULL; return NULL;
} }
if (argc > 3 && (!strcasecmp(argv[0], "acl") && !strcasecmp(argv[1], "dryrun"))) {
shift = 3;
} else if (argc > 2 && (!strcasecmp(argv[0], "command") &&
(!strcasecmp(argv[1], "getkeys") || !strcasecmp(argv[1], "getkeysandflags"))))
{
shift = 2;
}
argc -= shift;
argv += shift;
/* Search longest matching prefix command */ /* Search longest matching prefix command */
for (i = 0; i < helpEntriesLen; i++) { for (i = 0; i < helpEntriesLen; i++) {
if (!(helpEntries[i].type & CLI_HELP_COMMAND)) continue; if (!(helpEntries[i].type & CLI_HELP_COMMAND)) continue;
@ -973,7 +983,7 @@ static char *hintsCallback(const char *buf, int *color, int *bold) {
} }
sdsfreesplitres(rawargv,rawargc); sdsfreesplitres(rawargv,rawargc);
} }
sdsfreesplitres(argv,argc); sdsfreesplitres(argv - shift,argc + shift);
if (entry) { if (entry) {
*color = 90; *color = 90;