Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
4d475e0f
Commit
4d475e0f
authored
Dec 09, 2016
by
Harish Murthy
Committed by
antirez
Dec 16, 2016
Browse files
LogLog-Beta Algorithm support within HLL
Config option to use LogLog-Beta Algorithm for Cardinality
parent
90d918bd
Changes
4
Show whitespace changes
Inline
Side-by-side
src/config.c
View file @
4d475e0f
...
@@ -688,6 +688,10 @@ void loadServerConfigFromString(char *config) {
...
@@ -688,6 +688,10 @@ void loadServerConfigFromString(char *config) {
err
=
sentinelHandleConfiguration
(
argv
+
1
,
argc
-
1
);
err
=
sentinelHandleConfiguration
(
argv
+
1
,
argc
-
1
);
if
(
err
)
goto
loaderr
;
if
(
err
)
goto
loaderr
;
}
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"hll-use-loglogbeta"
)
&&
argc
==
2
)
{
if
((
server
.
hll_use_loglogbeta
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
}
}
else
{
}
else
{
err
=
"Bad directive or wrong number of arguments"
;
goto
loaderr
;
err
=
"Bad directive or wrong number of arguments"
;
goto
loaderr
;
}
}
...
@@ -981,6 +985,8 @@ void configSetCommand(client *c) {
...
@@ -981,6 +985,8 @@ void configSetCommand(client *c) {
"slave-lazy-flush"
,
server
.
repl_slave_lazy_flush
)
{
"slave-lazy-flush"
,
server
.
repl_slave_lazy_flush
)
{
}
config_set_bool_field
(
}
config_set_bool_field
(
"no-appendfsync-on-rewrite"
,
server
.
aof_no_fsync_on_rewrite
)
{
"no-appendfsync-on-rewrite"
,
server
.
aof_no_fsync_on_rewrite
)
{
}
config_set_bool_field
(
"hll-use-loglogbeta"
,
server
.
hll_use_loglogbeta
)
{
/* Numerical fields.
/* Numerical fields.
* config_set_numerical_field(name,var,min,max) */
* config_set_numerical_field(name,var,min,max) */
...
@@ -1245,6 +1251,8 @@ void configGetCommand(client *c) {
...
@@ -1245,6 +1251,8 @@ void configGetCommand(client *c) {
server
.
lazyfree_lazy_server_del
);
server
.
lazyfree_lazy_server_del
);
config_get_bool_field
(
"slave-lazy-flush"
,
config_get_bool_field
(
"slave-lazy-flush"
,
server
.
repl_slave_lazy_flush
);
server
.
repl_slave_lazy_flush
);
config_get_bool_field
(
"hll-use-loglogbeta"
,
server
.
hll_use_loglogbeta
);
/* Enum values */
/* Enum values */
config_get_enum_field
(
"maxmemory-policy"
,
config_get_enum_field
(
"maxmemory-policy"
,
...
@@ -1963,6 +1971,7 @@ int rewriteConfig(char *path) {
...
@@ -1963,6 +1971,7 @@ int rewriteConfig(char *path) {
rewriteConfigYesNoOption
(
state
,
"lazyfree-lazy-expire"
,
server
.
lazyfree_lazy_expire
,
CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE
);
rewriteConfigYesNoOption
(
state
,
"lazyfree-lazy-expire"
,
server
.
lazyfree_lazy_expire
,
CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE
);
rewriteConfigYesNoOption
(
state
,
"lazyfree-lazy-server-del"
,
server
.
lazyfree_lazy_server_del
,
CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL
);
rewriteConfigYesNoOption
(
state
,
"lazyfree-lazy-server-del"
,
server
.
lazyfree_lazy_server_del
,
CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL
);
rewriteConfigYesNoOption
(
state
,
"slave-lazy-flush"
,
server
.
repl_slave_lazy_flush
,
CONFIG_DEFAULT_SLAVE_LAZY_FLUSH
);
rewriteConfigYesNoOption
(
state
,
"slave-lazy-flush"
,
server
.
repl_slave_lazy_flush
,
CONFIG_DEFAULT_SLAVE_LAZY_FLUSH
);
rewriteConfigYesNoOption
(
state
,
"hll-use-loglogbeta"
,
server
.
hll_use_loglogbeta
,
CONFIG_DEFAULT_HLL_USE_LOGLOGBETA
);
/* Rewrite Sentinel config if in Sentinel mode. */
/* Rewrite Sentinel config if in Sentinel mode. */
if
(
server
.
sentinel_mode
)
rewriteConfigSentinelOption
(
state
);
if
(
server
.
sentinel_mode
)
rewriteConfigSentinelOption
(
state
);
...
...
src/hyperloglog.c
View file @
4d475e0f
...
@@ -994,6 +994,23 @@ uint64_t hllCount(struct hllhdr *hdr, int *invalid) {
...
@@ -994,6 +994,23 @@ uint64_t hllCount(struct hllhdr *hdr, int *invalid) {
serverPanic
(
"Unknown HyperLogLog encoding in hllCount()"
);
serverPanic
(
"Unknown HyperLogLog encoding in hllCount()"
);
}
}
if
(
server
.
hll_use_loglogbeta
)
{
/* For loglog-beta there is a single formula to compute
* cardinality for the enture range
*/
double
zl
=
log
(
ez
+
1
);
double
beta
=
-
0
.
370393911
*
ez
+
0
.
070471
823
*
zl
+
0
.
17393686
*
pow
(
zl
,
2
)
+
0
.
16339839
*
pow
(
zl
,
3
)
+
-
0
.
09237745
*
pow
(
zl
,
4
)
+
0
.
0373
8027
*
pow
(
zl
,
5
)
+
-
0
.
0053
84159
*
pow
(
zl
,
6
)
+
0
.
0004241
9
*
pow
(
zl
,
7
);
E
=
alpha
*
m
*
(
m
-
ez
)
*
(
1
/
(
E
+
beta
));
}
else
{
/* Muliply the inverse of E for alpha_m * m^2 to have the raw estimate. */
/* Muliply the inverse of E for alpha_m * m^2 to have the raw estimate. */
E
=
(
1
/
E
)
*
alpha
*
m
*
m
;
E
=
(
1
/
E
)
*
alpha
*
m
*
m
;
...
@@ -1020,6 +1037,7 @@ uint64_t hllCount(struct hllhdr *hdr, int *invalid) {
...
@@ -1020,6 +1037,7 @@ uint64_t hllCount(struct hllhdr *hdr, int *invalid) {
* a 64 bit function and 6 bit counters. To apply the correction for
* a 64 bit function and 6 bit counters. To apply the correction for
* 1/30 of 2^64 is not needed since it would require a huge set
* 1/30 of 2^64 is not needed since it would require a huge set
* to approach such a value. */
* to approach such a value. */
}
return
(
uint64_t
)
E
;
return
(
uint64_t
)
E
;
}
}
...
...
src/server.c
View file @
4d475e0f
...
@@ -1400,6 +1400,7 @@ void initServerConfig(void) {
...
@@ -1400,6 +1400,7 @@ void initServerConfig(void) {
server
.
lazyfree_lazy_eviction
=
CONFIG_DEFAULT_LAZYFREE_LAZY_EVICTION
;
server
.
lazyfree_lazy_eviction
=
CONFIG_DEFAULT_LAZYFREE_LAZY_EVICTION
;
server
.
lazyfree_lazy_expire
=
CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE
;
server
.
lazyfree_lazy_expire
=
CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE
;
server
.
lazyfree_lazy_server_del
=
CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL
;
server
.
lazyfree_lazy_server_del
=
CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL
;
server
.
hll_use_loglogbeta
=
CONFIG_DEFAULT_HLL_USE_LOGLOGBETA
;
server
.
lruclock
=
getLRUClock
();
server
.
lruclock
=
getLRUClock
();
resetServerSaveParams
();
resetServerSaveParams
();
...
...
src/server.h
View file @
4d475e0f
...
@@ -151,6 +151,7 @@ typedef long long mstime_t; /* millisecond time type. */
...
@@ -151,6 +151,7 @@ typedef long long mstime_t; /* millisecond time type. */
#define CONFIG_DEFAULT_LAZYFREE_LAZY_EVICTION 0
#define CONFIG_DEFAULT_LAZYFREE_LAZY_EVICTION 0
#define CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE 0
#define CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE 0
#define CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL 0
#define CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL 0
#define CONFIG_DEFAULT_HLL_USE_LOGLOGBETA 0
#define ACTIVE_EXPIRE_CYCLE_LOOKUPS_PER_LOOP 20
/* Loopkups per loop. */
#define ACTIVE_EXPIRE_CYCLE_LOOKUPS_PER_LOOP 20
/* Loopkups per loop. */
#define ACTIVE_EXPIRE_CYCLE_FAST_DURATION 1000
/* Microseconds */
#define ACTIVE_EXPIRE_CYCLE_FAST_DURATION 1000
/* Microseconds */
...
@@ -1149,6 +1150,7 @@ struct redisServer {
...
@@ -1149,6 +1150,7 @@ struct redisServer {
int
watchdog_period
;
/* Software watchdog period in ms. 0 = off */
int
watchdog_period
;
/* Software watchdog period in ms. 0 = off */
/* System hardware info */
/* System hardware info */
size_t
system_memory_size
;
/* Total memory in system as reported by OS */
size_t
system_memory_size
;
/* Total memory in system as reported by OS */
int
hll_use_loglogbeta
;
/* Use loglog-beta algorithm for HLL */
};
};
typedef
struct
pubsubPattern
{
typedef
struct
pubsubPattern
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment