caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

HLLMERGE fixed by adding a... missing loop!

Browse Source
This commit is contained in:
antirez 2014-03-31 16:02:36 +02:00
parent 0c9f06a237
commit f1b7608128
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hyperloglog.c
View File

@ -544,7 +544,7 @@ void hllCountCommand(redisClient *c) {
void hllMergeCommand(redisClient *c) { void hllMergeCommand(redisClient *c) {
uint8_t max[REDIS_HLL_REGISTERS]; uint8_t max[REDIS_HLL_REGISTERS];
uint8_t *registers; uint8_t *registers;
int j; int j, i;
/* Compute an HLL with M[i] = MAX(M[i]_j). /* Compute an HLL with M[i] = MAX(M[i]_j).
* We we the maximum into the max array of registers. We'll write * We we the maximum into the max array of registers. We'll write
@ -566,11 +566,13 @@ void hllMergeCommand(redisClient *c) {
return; return;
} }
/* Get the register and set it at max[j] if it's the greatest /* Merge with this HLL with our 'max' HHL by setting max[i]
* value so far. */ * to MAX(max[i],hll[i]). */
registers = o->ptr; registers = o->ptr;
HLL_GET_REGISTER(val,registers,j); for (i = 0; i < REDIS_HLL_REGISTERS; i++) {
if (val > max[j]) max[j] = val; HLL_GET_REGISTER(val,registers,i);
if (val > max[i]) max[i] = val;
}
} }
/* Create / unshare the destination key's value if needed. */ /* Create / unshare the destination key's value if needed. */