fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5562 from soloestoy/memory-usage-more-accurate

Browse Source 
MEMORY command: make USAGE more accurate
This commit is contained in:
Salvatore Sanfilippo 2018-11-28 18:16:04 +01:00 committed by GitHub
commit 4c544394eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/object.c
View File

@ -1285,8 +1285,6 @@ NULL
* *
* Usage: MEMORY usage <key> */ * Usage: MEMORY usage <key> */
void memoryCommand(client *c) { void memoryCommand(client *c) {
robj *o;
if (!strcasecmp(c->argv[1]->ptr,"help") && c->argc == 2) { if (!strcasecmp(c->argv[1]->ptr,"help") && c->argc == 2) {
const char *help[] = { const char *help[] = {
"DOCTOR - Return memory problems reports.", "DOCTOR - Return memory problems reports.",
@ -1298,6 +1296,7 @@ NULL
}; };
addReplyHelp(c, help); addReplyHelp(c, help);
} else if (!strcasecmp(c->argv[1]->ptr,"usage") && c->argc >= 3) { } else if (!strcasecmp(c->argv[1]->ptr,"usage") && c->argc >= 3) {
dictEntry *de;
long long samples = OBJ_COMPUTE_SIZE_DEF_SAMPLES; long long samples = OBJ_COMPUTE_SIZE_DEF_SAMPLES;
for (int j = 3; j < c->argc; j++) { for (int j = 3; j < c->argc; j++) {
if (!strcasecmp(c->argv[j]->ptr,"samples") && if (!strcasecmp(c->argv[j]->ptr,"samples") &&
@ -1316,10 +1315,12 @@ NULL
return; return;
} }
} }
if ((o = objectCommandLookupOrReply(c,c->argv[2],shared.nullbulk)) if ((de = dictFind(c->db->dict,c->argv[2]->ptr)) == NULL) {
== NULL) return; addReply(c, shared.nullbulk);
size_t usage = objectComputeSize(o,samples); return;
usage += sdsAllocSize(c->argv[2]->ptr); }
size_t usage = objectComputeSize(dictGetVal(de),samples);
usage += sdsAllocSize(dictGetKey(de));
usage += sizeof(dictEntry); usage += sizeof(dictEntry);
addReplyLongLong(c,usage); addReplyLongLong(c,usage);
} else if (!strcasecmp(c->argv[1]->ptr,"stats") && c->argc == 2) { } else if (!strcasecmp(c->argv[1]->ptr,"stats") && c->argc == 2) {