caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

redis-cli reads specified number of replies for UNSUBSCRIBE/PUNSUBSCRIBE/SUNSUBSCRIBE (#11047)

Browse Source 
In unsubscribe related commands, we need to read the specified
number of replies according to the number of parameters.

These commands may return multiple RESP replies, and currently
redis-cli only tries to read only one reply.

Fixes #11046, this redis-cli bug seems to be there forever.
Note that the [UN]SUBSCRIBE command response is a bit awkward
see: https://github.com/redis/redis-doc/pull/2327
This commit is contained in:
Binbin 2023-03-13 00:08:03 +08:00 committed by GitHub
parent 416842e6c0
commit 08cd3bf292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/redis-cli.c
View File

@ -1739,6 +1739,7 @@ static int cliSendCommand(int argc, char **argv, long repeat) {
char *command = argv[0];
size_t *argvlen;
int j, output_raw;
int is_unsubscribe_command = 0; /* Is it an unsubscribe related command? */
if (context == NULL) return REDIS_ERR;
@ -1777,6 +1778,9 @@ static int cliSendCommand(int argc, char **argv, long repeat) {
if (!strcasecmp(command,"subscribe") ||
!strcasecmp(command,"psubscribe") ||
!strcasecmp(command,"ssubscribe")) config.pubsub_mode = 1;
if (!strcasecmp(command,"unsubscribe") ||
!strcasecmp(command,"punsubscribe") ||
!strcasecmp(command,"sunsubscribe")) is_unsubscribe_command = 1;
if (!strcasecmp(command,"sync") ||
!strcasecmp(command,"psync")) config.slave_mode = 1;
@ -1807,6 +1811,22 @@ static int cliSendCommand(int argc, char **argv, long repeat) {
works well with the interval option. */
while(repeat < 0 || repeat-- > 0) {
redisAppendCommandArgv(context,argc,(const char**)argv,argvlen);
if (is_unsubscribe_command) {
/* In unsubscribe related commands, we need to read the specified
* number of replies according to the number of parameters. */
argc--; /* Skip the command */
do {
if (cliReadReply(output_raw) != REDIS_OK) {
cliPrintContextError();
exit(1);
}
fflush(stdout);
} while(--argc);
zfree(argvlen);
continue;
}
if (config.monitor_mode) {
do {
if (cliReadReply(output_raw) != REDIS_OK) {