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

PFCOUNT: always unshare/decode the object.

Browse Source 
This will be a non-op most of the times since the object will be
unshared / decoded, however it is more technically correct to start this
way since the object may be decoded even in the read-only code path.
This commit is contained in:
antirez 2014-04-04 15:29:32 +02:00
parent 1c12bcbcfb
commit d5be696db8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hyperloglog.c
View File

@ -520,6 +520,7 @@ void pfcountCommand(redisClient *c) {
addReply(c,shared.czero); addReply(c,shared.czero);
} else { } else {
if (isHLLObjectOrReply(c,o) != REDIS_OK) return; if (isHLLObjectOrReply(c,o) != REDIS_OK) return;
o = dbUnshareStringValue(c->db,c->argv[1],o);
/* Check if the cached cardinality is valid. */ /* Check if the cached cardinality is valid. */
registers = o->ptr; registers = o->ptr;
@ -535,9 +536,6 @@ void pfcountCommand(redisClient *c) {
card |= (uint64_t)registers[REDIS_HLL_SIZE-9] << 56; card |= (uint64_t)registers[REDIS_HLL_SIZE-9] << 56;
} else { } else {
/* Recompute it and update the cached value. */ /* Recompute it and update the cached value. */
o = dbUnshareStringValue(c->db,c->argv[1],o);
registers = o->ptr;
card = hllCount(registers); card = hllCount(registers);
registers[REDIS_HLL_SIZE-16] = card & 0xff; registers[REDIS_HLL_SIZE-16] = card & 0xff;
registers[REDIS_HLL_SIZE-15] = (card >> 8) & 0xff; registers[REDIS_HLL_SIZE-15] = (card >> 8) & 0xff;