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

Hyperloglog: refactoring of sparse/dense add function.

Browse Source 
The commit splits the add functions into a set() and add() set of
functions, so that it's possible to set registers in an independent way
just having the index and count.

Related to #3819, otherwise a fix is not possible.
This commit is contained in:
antirez 2017-12-22 10:45:31 +01:00
parent 238c9bd086
commit cbe9d725a7
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/hyperloglog.c
View File

@ -475,9 +475,8 @@ int hllPatLen(unsigned char *ele, size_t elesize, long *regp) {
/* ================== Dense representation implementation ================== */ /* ================== Dense representation implementation ================== */
/* "Add" the element in the dense hyperloglog data structure. /* Low level function to set the dense HLL register at 'index' to the
* Actually nothing is added, but the max 0 pattern counter of the subset * specified value if the current value is smaller than 'count'.
* the element belongs to is incremented if needed.
* *
* 'registers' is expected to have room for HLL_REGISTERS plus an * 'registers' is expected to have room for HLL_REGISTERS plus an
* additional byte on the right. This requirement is met by sds strings * additional byte on the right. This requirement is met by sds strings
@ -486,12 +485,9 @@ int hllPatLen(unsigned char *ele, size_t elesize, long *regp) {
* The function always succeed, however if as a result of the operation * The function always succeed, however if as a result of the operation
* the approximated cardinality changed, 1 is returned. Otherwise 0 * the approximated cardinality changed, 1 is returned. Otherwise 0
* is returned. */ * is returned. */
int hllDenseAdd(uint8_t *registers, unsigned char *ele, size_t elesize) { int hllDenseSet(uint8_t *registers, long index, uint8_t count) {
uint8_t oldcount, count; uint8_t oldcount;
long index;
/* Update the register if this element produced a longer run of zeroes. */
count = hllPatLen(ele,elesize,&index);
HLL_DENSE_GET_REGISTER(oldcount,registers,index); HLL_DENSE_GET_REGISTER(oldcount,registers,index);
if (count > oldcount) { if (count > oldcount) {
HLL_DENSE_SET_REGISTER(registers,index,count); HLL_DENSE_SET_REGISTER(registers,index,count);
@ -501,6 +497,19 @@ int hllDenseAdd(uint8_t *registers, unsigned char *ele, size_t elesize) {
} }
} }
/* "Add" the element in the dense hyperloglog data structure.
* Actually nothing is added, but the max 0 pattern counter of the subset
* the element belongs to is incremented if needed.
*
* This is just a wrapper to hllDenseSet(), performing the hashing of the
* element in order to retrieve the index and zero-run count. */
int hllDenseAdd(uint8_t *registers, unsigned char *ele, size_t elesize) {
long index;
uint8_t count = hllPatLen(ele,elesize,&index);
/* Update the register if this element produced a longer run of zeroes. */
return hllDenseSet(registers,index,count);
}
/* Compute SUM(2^-reg) in the dense representation. /* Compute SUM(2^-reg) in the dense representation.
* PE is an array with a pre-computer table of values 2^-reg indexed by reg. * PE is an array with a pre-computer table of values 2^-reg indexed by reg.
* As a side effect the integer pointed by 'ezp' is set to the number * As a side effect the integer pointed by 'ezp' is set to the number
@ -623,9 +632,8 @@ int hllSparseToDense(robj *o) {
return C_OK; return C_OK;
} }
/* "Add" the element in the sparse hyperloglog data structure. /* Low level function to set the sparse HLL register at 'index' to the
* Actually nothing is added, but the max 0 pattern counter of the subset * specified value if the current value is smaller than 'count'.
* the element belongs to is incremented if needed.
* *
* The object 'o' is the String object holding the HLL. The function requires * The object 'o' is the String object holding the HLL. The function requires
* a reference to the object in order to be able to enlarge the string if * a reference to the object in order to be able to enlarge the string if
@ -639,15 +647,12 @@ int hllSparseToDense(robj *o) {
* sparse to dense: this happens when a register requires to be set to a value * sparse to dense: this happens when a register requires to be set to a value
* not representable with the sparse representation, or when the resulting * not representable with the sparse representation, or when the resulting
* size would be greater than server.hll_sparse_max_bytes. */ * size would be greater than server.hll_sparse_max_bytes. */
int hllSparseAdd(robj *o, unsigned char *ele, size_t elesize) { int hllSparseSet(robj *o, long index, uint8_t count) {
struct hllhdr *hdr; struct hllhdr *hdr;
uint8_t oldcount, count, *sparse, *end, *p, *prev, *next; uint8_t oldcount, *sparse, *end, *p, *prev, *next;
long index, first, span; long first, span;
long is_zero = 0, is_xzero = 0, is_val = 0, runlen = 0; long is_zero = 0, is_xzero = 0, is_val = 0, runlen = 0;
/* Update the register if this element produced a longer run of zeroes. */
count = hllPatLen(ele,elesize,&index);
/* If the count is too big to be representable by the sparse representation /* If the count is too big to be representable by the sparse representation
* switch to dense representation. */ * switch to dense representation. */
if (count > HLL_SPARSE_VAL_MAX_VALUE) goto promote; if (count > HLL_SPARSE_VAL_MAX_VALUE) goto promote;
@ -880,11 +885,24 @@ promote: /* Promote to dense representation. */
* Note that this in turn means that PFADD will make sure the command * Note that this in turn means that PFADD will make sure the command
* is propagated to slaves / AOF, so if there is a sparse -> dense * is propagated to slaves / AOF, so if there is a sparse -> dense
* convertion, it will be performed in all the slaves as well. */ * convertion, it will be performed in all the slaves as well. */
int dense_retval = hllDenseAdd(hdr->registers, ele, elesize); int dense_retval = hllDenseSet(hdr->registers,index,count);
serverAssert(dense_retval == 1); serverAssert(dense_retval == 1);
return dense_retval; return dense_retval;
} }
/* "Add" the element in the sparse hyperloglog data structure.
* Actually nothing is added, but the max 0 pattern counter of the subset
* the element belongs to is incremented if needed.
*
* This function is actually a wrapper for hllSparseSet(), it only performs
* the hashshing of the elmenet to obtain the index and zeros run length. */
int hllSparseAdd(robj *o, unsigned char *ele, size_t elesize) {
long index;
uint8_t count = hllPatLen(ele,elesize,&index);
/* Update the register if this element produced a longer run of zeroes. */
return hllSparseSet(o,index,count);
}
/* Compute SUM(2^-reg) in the sparse representation. /* Compute SUM(2^-reg) in the sparse representation.
* PE is an array with a pre-computer table of values 2^-reg indexed by reg. * PE is an array with a pre-computer table of values 2^-reg indexed by reg.
* As a side effect the integer pointed by 'ezp' is set to the number * As a side effect the integer pointed by 'ezp' is set to the number
@ -1282,7 +1300,7 @@ void pfmergeCommand(client *c) {
int j; int j;
/* 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 store the maximum into the max array of registers. We'll write
* it to the target variable later. */ * it to the target variable later. */
memset(max,0,sizeof(max)); memset(max,0,sizeof(max));
for (j = 1; j < c->argc; j++) { for (j = 1; j < c->argc; j++) {
@ -1329,7 +1347,7 @@ void pfmergeCommand(client *c) {
HLL_INVALIDATE_CACHE(hdr); HLL_INVALIDATE_CACHE(hdr);
signalModifiedKey(c->db,c->argv[1]); signalModifiedKey(c->db,c->argv[1]);
/* We generate an PFADD event for PFMERGE for semantical simplicity /* We generate a PFADD event for PFMERGE for semantical simplicity
* since in theory this is a mass-add of elements. */ * since in theory this is a mass-add of elements. */
notifyKeyspaceEvent(NOTIFY_STRING,"pfadd",c->argv[1],c->db->id); notifyKeyspaceEvent(NOTIFY_STRING,"pfadd",c->argv[1],c->db->id);
server.dirty++; server.dirty++;