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

hllSparseToDense API changed to take ref to object.

Browse Source 
The new API takes directly the object doing everything needed to
turn it into a dense representation, including setting the new
representation as object->ptr.
This commit is contained in:
antirez 2014-04-13 22:59:27 +02:00
parent 2067644a8c
commit e8e717e145
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hyperloglog.c
View File

@ -560,12 +560,16 @@ double hllDenseSum(uint8_t *registers, double *PE, int *ezp) {
/* Convert the HLL with sparse representation given as input in its dense /* Convert the HLL with sparse representation given as input in its dense
* representation. Both representations are represented by SDS strings, and * representation. Both representations are represented by SDS strings, and
* the input representation is freed as a side effect. */ * the input representation is freed as a side effect. */
sds hllSparseToDense(sds sparse) { void hllSparseToDense(robj *o) {
sds dense; sds sparse = o->ptr, dense;
struct hllhdr *hdr, *oldhdr = (struct hllhdr*)sparse; struct hllhdr *hdr, *oldhdr = (struct hllhdr*)sparse;
int idx = 0, runlen, regval; int idx = 0, runlen, regval;
uint8_t *p = (uint8_t*)sparse, *end = p+sdslen(sparse); uint8_t *p = (uint8_t*)sparse, *end = p+sdslen(sparse);
/* If the representation is already the right one return ASAP. */
hdr = (struct hllhdr*) sparse;
if (hdr->encoding == HLL_DENSE) return;
/* Create a string of the right size filled with zero bytes. /* Create a string of the right size filled with zero bytes.
* Note that the cached cardinality is set to 0 as a side effect * Note that the cached cardinality is set to 0 as a side effect
* that is exactly the cardinality of an empty HLL. */ * that is exactly the cardinality of an empty HLL. */
@ -597,9 +601,9 @@ sds hllSparseToDense(sds sparse) {
} }
} }
/* Free the old representation and return the new one. */ /* Free the old representation and set the new one. */
sdsfree(sparse); sdsfree(o->ptr);
return dense; o->ptr = dense;
} }
/* "Add" the element in the sparse hyperloglog data structure. /* "Add" the element in the sparse hyperloglog data structure.
@ -805,7 +809,7 @@ updated:
return 1; return 1;
promote: /* Promote to dense representation. */ promote: /* Promote to dense representation. */
o->ptr = hllSparseToDense(o->ptr); hllSparseToDense(o);
hdr = o->ptr; hdr = o->ptr;
return hllDenseAdd(hdr->registers, ele, elesize); return hllDenseAdd(hdr->registers, ele, elesize);
} }