fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-05-12 18:57:14 +00:00
Code Issues Projects Releases Wiki Activity

more slow log merge, I forgot to resolve a conflict.

Browse Source
This commit is contained in:
antirez 2011-07-02 00:27:10 +02:00
parent 06966abc66
commit 30b345ddbb
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/redis.h
View File

@ -404,15 +404,12 @@ struct redisServer {
long long stat_evictedkeys; /* number of evicted keys (maxmemory) */ long long stat_evictedkeys; /* number of evicted keys (maxmemory) */
long long stat_keyspace_hits; /* number of successful lookups of keys */ long long stat_keyspace_hits; /* number of successful lookups of keys */
long long stat_keyspace_misses; /* number of failed lookups of keys */ long long stat_keyspace_misses; /* number of failed lookups of keys */
<<<<<<< HEAD
size_t stat_peak_memory; /* max used memory record */ size_t stat_peak_memory; /* max used memory record */
long long stat_fork_time; /* time needed to perform latets fork() */ long long stat_fork_time; /* time needed to perform latets fork() */
=======
list *slowlog; list *slowlog;
long long slowlog_entry_id; long long slowlog_entry_id;
long long slowlog_log_slower_than; long long slowlog_log_slower_than;
unsigned long slowlog_max_len; unsigned long slowlog_max_len;
>>>>>>> ad6347b... Slowlog backported to 2.2
/* Configuration */ /* Configuration */
int verbosity; int verbosity;
int maxidletime; int maxidletime;