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

redis-cli when SELECT fails, we should reset dbnum to 0 (#8898)

Browse Source 
when SELECT fails, we should reset dbnum to 0, so the prompt will not
display incorrectly.

Additionally when SELECT and HELLO fail, we output message to inform
it.

Add config.input_dbnum which means the dbnum about to select.
And config.dbnum means currently selected dbnum. When users succeed to
select db, config.dbnum and config.input_dbnum will be the same. When
users select db failed, config.input_dbnum will be kept. Next time if users
auth success, config.input_dbnum will be automatically selected.
When reconnect, we should select the origin dbnum.

Co-authored-by: Oran Agra <oran@redislabs.com>
(cherry picked from commit 6b475989984bb28499327e33cc79315d6264bc06)
This commit is contained in:
Huang Zhw 2021-05-06 23:34:45 +08:00 committed by Oran Agra
parent 530c70b0a9
commit 1ce06604de
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/redis-cli.c
View File

@ -207,7 +207,8 @@ static struct config {
cliSSLconfig sslconfig; cliSSLconfig sslconfig;
long repeat; long repeat;
long interval; long interval;
int dbnum; int dbnum; /* db num currently selected */
int input_dbnum; /* db num user input */
int interactive; int interactive;
int shutdown; int shutdown;
int monitor_mode; int monitor_mode;
@ -445,7 +446,7 @@ static void parseRedisUri(const char *uri) {
if (curr == end) return; if (curr == end) return;
/* Extract database number. */ /* Extract database number. */
config.dbnum = atoi(curr); config.input_dbnum = atoi(curr);
} }
static uint64_t dictSdsHash(const void *key) { static uint64_t dictSdsHash(const void *key) {
@ -801,15 +802,21 @@ static int cliAuth(redisContext *ctx, char *user, char *auth) {
return REDIS_ERR; return REDIS_ERR;
} }
/* Send SELECT dbnum to the server */ /* Send SELECT input_dbnum to the server */
static int cliSelect(void) { static int cliSelect(void) {
redisReply *reply; redisReply *reply;
if (config.dbnum == 0) return REDIS_OK; if (config.input_dbnum == config.dbnum) return REDIS_OK;
reply = redisCommand(context,"SELECT %d",config.dbnum); reply = redisCommand(context,"SELECT %d",config.input_dbnum);
if (reply != NULL) { if (reply != NULL) {
int result = REDIS_OK; int result = REDIS_OK;
if (reply->type == REDIS_REPLY_ERROR) result = REDIS_ERR; if (reply->type == REDIS_REPLY_ERROR) {
result = REDIS_ERR;
fprintf(stderr,"SELECT %d failed: %s\n",config.input_dbnum,reply->str);
} else {
config.dbnum = config.input_dbnum;
cliRefreshPrompt();
}
freeReplyObject(reply); freeReplyObject(reply);
return result; return result;
} }
@ -824,7 +831,10 @@ static int cliSwitchProto(void) {
reply = redisCommand(context,"HELLO 3"); reply = redisCommand(context,"HELLO 3");
if (reply != NULL) { if (reply != NULL) {
int result = REDIS_OK; int result = REDIS_OK;
if (reply->type == REDIS_REPLY_ERROR) result = REDIS_ERR; if (reply->type == REDIS_REPLY_ERROR) {
result = REDIS_ERR;
fprintf(stderr,"HELLO 3 failed: %s\n",reply->str);
}
freeReplyObject(reply); freeReplyObject(reply);
return result; return result;
} }
@ -1434,7 +1444,7 @@ static int cliSendCommand(int argc, char **argv, long repeat) {
if (!strcasecmp(command,"select") && argc == 2 && if (!strcasecmp(command,"select") && argc == 2 &&
config.last_cmd_type != REDIS_REPLY_ERROR) config.last_cmd_type != REDIS_REPLY_ERROR)
{ {
config.dbnum = atoi(argv[1]); config.input_dbnum = config.dbnum = atoi(argv[1]);
cliRefreshPrompt(); cliRefreshPrompt();
} else if (!strcasecmp(command,"auth") && (argc == 2 || argc == 3)) { } else if (!strcasecmp(command,"auth") && (argc == 2 || argc == 3)) {
cliSelect(); cliSelect();
@ -1446,15 +1456,17 @@ static int cliSendCommand(int argc, char **argv, long repeat) {
cliRefreshPrompt(); cliRefreshPrompt();
} else if (!strcasecmp(command,"exec") && argc == 1 && config.in_multi) { } else if (!strcasecmp(command,"exec") && argc == 1 && config.in_multi) {
config.in_multi = 0; config.in_multi = 0;
if (config.last_cmd_type == REDIS_REPLY_ERROR) { if (config.last_cmd_type == REDIS_REPLY_ERROR ||
config.dbnum = config.pre_multi_dbnum; config.last_cmd_type == REDIS_REPLY_NIL)
{
config.input_dbnum = config.dbnum = config.pre_multi_dbnum;
} }
cliRefreshPrompt(); cliRefreshPrompt();
} else if (!strcasecmp(command,"discard") && argc == 1 && } else if (!strcasecmp(command,"discard") && argc == 1 &&
config.last_cmd_type != REDIS_REPLY_ERROR) config.last_cmd_type != REDIS_REPLY_ERROR)
{ {
config.in_multi = 0; config.in_multi = 0;
config.dbnum = config.pre_multi_dbnum; config.input_dbnum = config.dbnum = config.pre_multi_dbnum;
cliRefreshPrompt(); cliRefreshPrompt();
} }
} }
@ -1541,7 +1553,7 @@ static int parseOptions(int argc, char **argv) {
double seconds = atof(argv[++i]); double seconds = atof(argv[++i]);
config.interval = seconds*1000000; config.interval = seconds*1000000;
} else if (!strcmp(argv[i],"-n") && !lastarg) { } else if (!strcmp(argv[i],"-n") && !lastarg) {
config.dbnum = atoi(argv[++i]); config.input_dbnum = atoi(argv[++i]);
} else if (!strcmp(argv[i], "--no-auth-warning")) { } else if (!strcmp(argv[i], "--no-auth-warning")) {
config.no_auth_warning = 1; config.no_auth_warning = 1;
} else if (!strcmp(argv[i], "--askpass")) { } else if (!strcmp(argv[i], "--askpass")) {
@ -8209,6 +8221,7 @@ int main(int argc, char **argv) {
config.repeat = 1; config.repeat = 1;
config.interval = 0; config.interval = 0;
config.dbnum = 0; config.dbnum = 0;
config.input_dbnum = 0;
config.interactive = 0; config.interactive = 0;
config.shutdown = 0; config.shutdown = 0;
config.monitor_mode = 0; config.monitor_mode = 0;