mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MEMORY USAGE can take the SAMPLES arg only once 

For some unknown reason it seems the code used to accommodate
repeated SAMPLES args...
This commit is contained in:
Guy Benoish 2022-09-28 11:36:05 +02:00
parent 6d21560190
commit f763ec424b
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/object.c
View File

@ -1497,25 +1497,22 @@ void memoryCommand(client *c) {
NULL
};
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 || c->argc == 5)) {
dictEntry *de;
long long samples = OBJ_COMPUTE_SIZE_DEF_SAMPLES;
for (int j = 3; j < c->argc; j++) {
if (!strcasecmp(c->argv[j]->ptr,"samples") &&
j+1 < c->argc)
{
if (getLongLongFromObjectOrReply(c,c->argv[j+1],&samples,NULL)
== C_ERR) return;
if (samples < 0) {
addReplyErrorObject(c,shared.syntaxerr);
return;
}
if (samples == 0) samples = LLONG_MAX;
j++; /* skip option argument. */
} else {
if (c->argc == 5) {
if (strcasecmp(c->argv[3]->ptr, "samples")) {
addReplyErrorObject(c,shared.syntaxerr);
return;
}
if (getLongLongFromObjectOrReply(c,c->argv[4],&samples,NULL) == C_ERR)
return;
if (samples < 0) {
addReplyErrorObject(c,shared.syntaxerr);
return;
}
if (samples == 0)
samples = LLONG_MAX;
}
if ((de = dictFind(c->db->dict,c->argv[2]->ptr)) == NULL) {
addReplyNull(c);

11
tests/unit/introspection-2.tcl
View File

@ -26,6 +26,17 @@ start_server {tags {"introspection"}} {
r touch key0{t} key1{t} key2{t} key3{t}
} 2
test {MEMORY USAGE with SAMPLES syntax} {
r lpush foo e1 e2 e3
assert_error {ERR syntax*} {r memory usage foo samplestypo 1}
assert_error {ERR syntax*} {r memory usage foo samples -1}
assert_error {ERR unknown subcommand or wrong number*} {r memory usage foo samples 1 samples 1}
assert_morethan [r memory usage foo samples 0] 0
assert_morethan [r memory usage foo samples 1] 0
assert_morethan [r memory usage foo samples 10] 0
r del foo
}
test {command stats for GEOADD} {
r config resetstat
r GEOADD foo 0 0 bar