Commit 5afcca34 authored by antirez's avatar antirez
Browse files

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

Using both the initials of Philippe Flajolet instead of just "P".
parent ba4e2083
......@@ -435,8 +435,8 @@ uint64_t hllCount(uint8_t *registers) {
/* ========================== HyperLogLog commands ========================== */
/* PADD var ele ele ele ... ele => :0 or :1 */
void paddCommand(redisClient *c) {
/* PFADD var ele ele ele ... ele => :0 or :1 */
void pfaddCommand(redisClient *c) {
robj *o = lookupKeyWrite(c->db,c->argv[1]);
uint8_t *registers;
int updated = 0, j;
......@@ -482,8 +482,8 @@ void paddCommand(redisClient *c) {
addReply(c, updated ? shared.cone : shared.czero);
}
/* PCOUNT var -> approximated cardinality of set. */
void pcountCommand(redisClient *c) {
/* PFCOUNT var -> approximated cardinality of set. */
void pfcountCommand(redisClient *c) {
robj *o = lookupKeyRead(c->db,c->argv[1]);
uint8_t *registers;
uint64_t card;
......@@ -540,8 +540,8 @@ void pcountCommand(redisClient *c) {
}
}
/* PMERGE dest src1 src2 src3 ... srcN => OK */
void pmergeCommand(redisClient *c) {
/* PFMERGE dest src1 src2 src3 ... srcN => OK */
void pfmergeCommand(redisClient *c) {
uint8_t max[REDIS_HLL_REGISTERS];
uint8_t *registers;
int j, i;
......@@ -614,7 +614,7 @@ void pmergeCommand(redisClient *c) {
* the correct value to be retained and not affect adjacent values. */
#define REDIS_HLL_TEST_CYCLES 1000
void pselftestCommand(redisClient *c) {
void pfselftestCommand(redisClient *c) {
int j, i;
sds bitcounters = sdsnewlen(NULL,REDIS_HLL_SIZE);
uint8_t bytecounters[REDIS_HLL_REGISTERS];
......
......@@ -268,10 +268,10 @@ struct redisCommand redisCommandTable[] = {
{"bitcount",bitcountCommand,-2,"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},
{"pselftest",pselftestCommand,1,"r",0,NULL,0,0,0,0,0},
{"padd",paddCommand,-2,"wm",0,NULL,1,1,1,0,0},
{"pcount",pcountCommand,2,"w",0,NULL,1,1,1,0,0},
{"pmerge",pmergeCommand,-2,"wm",0,NULL,1,-1,1,0,0}
{"pfselftest",pfselftestCommand,1,"r",0,NULL,0,0,0,0,0},
{"pfadd",pfaddCommand,-2,"wm",0,NULL,1,1,1,0,0},
{"pfcount",pfcountCommand,2,"w",0,NULL,1,1,1,0,0},
{"pfmerge",pfmergeCommand,-2,"wm",0,NULL,1,-1,1,0,0}
};
struct evictionPoolEntry *evictionPoolAlloc(void);
......
......@@ -1448,10 +1448,10 @@ void bitcountCommand(redisClient *c);
void bitposCommand(redisClient *c);
void replconfCommand(redisClient *c);
void waitCommand(redisClient *c);
void pselftestCommand(redisClient *c);
void paddCommand(redisClient *c);
void pcountCommand(redisClient *c);
void pmergeCommand(redisClient *c);
void pfselftestCommand(redisClient *c);
void pfaddCommand(redisClient *c);
void pfcountCommand(redisClient *c);
void pfmergeCommand(redisClient *c);
#if defined(__GNUC__)
void *calloc(size_t count, size_t size) __attribute__ ((deprecated));
......
......@@ -18,9 +18,9 @@ while true do
elements << ele
i += 1
}
r.padd('hll',*elements)
r.pfadd('hll',*elements)
}
approx = r.pcount('hll')
approx = r.pfcount('hll')
abs_err = (approx-i).abs
rel_err = 100.to_f*abs_err/i
puts "#{i} vs #{approx}: #{rel_err}%"
......
......@@ -30,9 +30,9 @@ def run_experiment(r,seed,max,step)
elements << ele
i += 1
}
r.padd('hll',*elements)
r.pfadd('hll',*elements)
}
approx = r.pcount('hll')
approx = r.pfcount('hll')
err = approx-i
rel_err = 100.to_f*err/i
samples << [i,rel_err]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment