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

redis-cli --stat take dbnum value from CONFIG GET to output total keys (#12279)

Browse Source 
In the past we hardcoded it to 20, causing it to not count keys
for more databases.
This commit is contained in:
Binbin 2023-08-16 15:54:37 +08:00 committed by GitHub
parent ac6bc5d1a8
commit 44cc0fcb9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/redis-cli.c
View File

@ -8889,6 +8889,28 @@ static int getDbSize(void) {
return size;
}
static int getDatabases(void) {
redisReply *reply;
int dbnum;
reply = redisCommand(context, "CONFIG GET databases");
if (reply == NULL) {
fprintf(stderr, "\nI/O error\n");
exit(1);
} else if (reply->type == REDIS_REPLY_ERROR) {
dbnum = 16;
fprintf(stderr, "CONFIG GET databases fails: %s, use default value 16 instead\n", reply->str);
} else {
assert(reply->type == (config.current_resp3 ? REDIS_REPLY_MAP : REDIS_REPLY_ARRAY));
assert(reply->elements == 2);
dbnum = atoi(reply->element[1]->str);
}
freeReplyObject(reply);
return dbnum;
}
typedef struct {
char *name;
char *sizecmd;
@ -9371,6 +9393,7 @@ void bytesToHuman(char *s, size_t size, long long n) {
static void statMode(void) {
redisReply *reply;
long aux, requests = 0;
int dbnum = getDatabases();
int i = 0;
while(1) {
@ -9394,7 +9417,7 @@ static void statMode(void) {
/* Keys */
aux = 0;
for (j = 0; j < 20; j++) {
for (j = 0; j < dbnum; j++) {
long k;
snprintf(buf,sizeof(buf),"db%d:keys",j);