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

HyperLogLog API prefix modified from "P" to "PF".

Browse Source 
Using both the initials of Philippe Flajolet instead of just "P".
This commit is contained in:
antirez 2014-03-31 22:48:01 +02:00
parent ba4e20835a
commit 5afcca34ce
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hyperloglog.c
View File

@ -435,8 +435,8 @@ uint64_t hllCount(uint8_t *registers) {
/* ========================== HyperLogLog commands ========================== */ /* ========================== HyperLogLog commands ========================== */
/* PADD var ele ele ele ... ele => :0 or :1 */ /* PFADD var ele ele ele ... ele => :0 or :1 */
void paddCommand(redisClient *c) { void pfaddCommand(redisClient *c) {
robj *o = lookupKeyWrite(c->db,c->argv[1]); robj *o = lookupKeyWrite(c->db,c->argv[1]);
uint8_t *registers; uint8_t *registers;
int updated = 0, j; int updated = 0, j;
@ -482,8 +482,8 @@ void paddCommand(redisClient *c) {
addReply(c, updated ? shared.cone : shared.czero); addReply(c, updated ? shared.cone : shared.czero);
} }
/* PCOUNT var -> approximated cardinality of set. */ /* PFCOUNT var -> approximated cardinality of set. */
void pcountCommand(redisClient *c) { void pfcountCommand(redisClient *c) {
robj *o = lookupKeyRead(c->db,c->argv[1]); robj *o = lookupKeyRead(c->db,c->argv[1]);
uint8_t *registers; uint8_t *registers;
uint64_t card; uint64_t card;
@ -540,8 +540,8 @@ void pcountCommand(redisClient *c) {
} }
} }
/* PMERGE dest src1 src2 src3 ... srcN => OK */ /* PFMERGE dest src1 src2 src3 ... srcN => OK */
void pmergeCommand(redisClient *c) { void pfmergeCommand(redisClient *c) {
uint8_t max[REDIS_HLL_REGISTERS]; uint8_t max[REDIS_HLL_REGISTERS];
uint8_t *registers; uint8_t *registers;
int j, i; int j, i;
@ -614,7 +614,7 @@ void pmergeCommand(redisClient *c) {
* the correct value to be retained and not affect adjacent values. */ * the correct value to be retained and not affect adjacent values. */
#define REDIS_HLL_TEST_CYCLES 1000 #define REDIS_HLL_TEST_CYCLES 1000
void pselftestCommand(redisClient *c) { void pfselftestCommand(redisClient *c) {
int j, i; int j, i;
sds bitcounters = sdsnewlen(NULL,REDIS_HLL_SIZE); sds bitcounters = sdsnewlen(NULL,REDIS_HLL_SIZE);
uint8_t bytecounters[REDIS_HLL_REGISTERS]; uint8_t bytecounters[REDIS_HLL_REGISTERS];

8
src/redis.c
View File

@ -268,10 +268,10 @@ struct redisCommand redisCommandTable[] = {
{"bitcount",bitcountCommand,-2,"r",0,NULL,1,1,1,0,0}, {"bitcount",bitcountCommand,-2,"r",0,NULL,1,1,1,0,0},
{"bitpos",bitposCommand,-3,"r",0,NULL,1,1,1,0,0}, {"bitpos",bitposCommand,-3,"r",0,NULL,1,1,1,0,0},
{"wait",waitCommand,3,"rs",0,NULL,0,0,0,0,0}, {"wait",waitCommand,3,"rs",0,NULL,0,0,0,0,0},
{"pselftest",pselftestCommand,1,"r",0,NULL,0,0,0,0,0}, {"pfselftest",pfselftestCommand,1,"r",0,NULL,0,0,0,0,0},
{"padd",paddCommand,-2,"wm",0,NULL,1,1,1,0,0}, {"pfadd",pfaddCommand,-2,"wm",0,NULL,1,1,1,0,0},
{"pcount",pcountCommand,2,"w",0,NULL,1,1,1,0,0}, {"pfcount",pfcountCommand,2,"w",0,NULL,1,1,1,0,0},
{"pmerge",pmergeCommand,-2,"wm",0,NULL,1,-1,1,0,0} {"pfmerge",pfmergeCommand,-2,"wm",0,NULL,1,-1,1,0,0}
}; };
struct evictionPoolEntry *evictionPoolAlloc(void); struct evictionPoolEntry *evictionPoolAlloc(void);

8
src/redis.h
View File

@ -1448,10 +1448,10 @@ void bitcountCommand(redisClient *c);
void bitposCommand(redisClient *c); void bitposCommand(redisClient *c);
void replconfCommand(redisClient *c); void replconfCommand(redisClient *c);
void waitCommand(redisClient *c); void waitCommand(redisClient *c);
void pselftestCommand(redisClient *c); void pfselftestCommand(redisClient *c);
void paddCommand(redisClient *c); void pfaddCommand(redisClient *c);
void pcountCommand(redisClient *c); void pfcountCommand(redisClient *c);
void pmergeCommand(redisClient *c); void pfmergeCommand(redisClient *c);
#if defined(__GNUC__) #if defined(__GNUC__)
void *calloc(size_t count, size_t size) __attribute__ ((deprecated)); void *calloc(size_t count, size_t size) __attribute__ ((deprecated));

4
utils/hyperloglog/hll-err.rb
View File

@ -18,9 +18,9 @@ while true do
elements << ele elements << ele
i += 1 i += 1
} }
r.padd('hll',*elements) r.pfadd('hll',*elements)
} }
approx = r.pcount('hll') approx = r.pfcount('hll')
abs_err = (approx-i).abs abs_err = (approx-i).abs
rel_err = 100.to_f*abs_err/i rel_err = 100.to_f*abs_err/i
puts "#{i} vs #{approx}: #{rel_err}%" puts "#{i} vs #{approx}: #{rel_err}%"

4
utils/hyperloglog/hll-gnuplot-graph.rb
View File

@ -30,9 +30,9 @@ def run_experiment(r,seed,max,step)
elements << ele elements << ele
i += 1 i += 1
} }
r.padd('hll',*elements) r.pfadd('hll',*elements)
} }
approx = r.pcount('hll') approx = r.pfcount('hll')
err = approx-i err = approx-i
rel_err = 100.to_f*err/i rel_err = 100.to_f*err/i
samples << [i,rel_err] samples << [i,rel_err]