Commit cef054e8 authored by antirez's avatar antirez
Browse files

RDMF (Redis/Disque merge friendlyness) refactoring WIP 1.

parent b684e2da
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "rio.h" #include "rio.h"
/* TBD: include only necessary headers. */ /* TBD: include only necessary headers. */
#include "redis.h" #include "server.h"
/* The current RDB version. When the format changes in a way that is no longer /* The current RDB version. When the format changes in a way that is no longer
* backward compatible this number gets incremented. */ * backward compatible this number gets incremented. */
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
#include "redis.h" #include "server.h"
#include "rdb.h" #include "rdb.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
#include "redis.h" #include "server.h"
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include "util.h" #include "util.h"
#include "crc64.h" #include "crc64.h"
#include "config.h" #include "config.h"
#include "redis.h" #include "server.h"
/* ------------------------- Buffer I/O implementation ----------------------- */ /* ------------------------- Buffer I/O implementation ----------------------- */
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
#include "sha1.h" #include "sha1.h"
#include "rand.h" #include "rand.h"
#include "cluster.h" #include "cluster.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
#include "hiredis.h" #include "hiredis.h"
#include "async.h" #include "async.h"
...@@ -1840,7 +1840,7 @@ void sentinelFlushConfig(void) { ...@@ -1840,7 +1840,7 @@ void sentinelFlushConfig(void) {
int saved_hz = server.hz; int saved_hz = server.hz;
int rewrite_status; int rewrite_status;
server.hz = REDIS_DEFAULT_HZ; server.hz = CONFIG_DEFAULT_HZ;
rewrite_status = rewriteConfig(server.configfile); rewrite_status = rewriteConfig(server.configfile);
server.hz = saved_hz; server.hz = saved_hz;
...@@ -4288,6 +4288,6 @@ void sentinelTimer(void) { ...@@ -4288,6 +4288,6 @@ void sentinelTimer(void) {
* exactly continue to stay synchronized asking to be voted at the * exactly continue to stay synchronized asking to be voted at the
* same time again and again (resulting in nobody likely winning the * same time again and again (resulting in nobody likely winning the
* election because of split brain voting). */ * election because of split brain voting). */
server.hz = REDIS_DEFAULT_HZ + rand() % REDIS_DEFAULT_HZ; server.hz = CONFIG_DEFAULT_HZ + rand() % CONFIG_DEFAULT_HZ;
} }
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
#include "cluster.h" #include "cluster.h"
#include "slowlog.h" #include "slowlog.h"
#include "bio.h" #include "bio.h"
...@@ -1416,34 +1416,34 @@ void initServerConfig(void) { ...@@ -1416,34 +1416,34 @@ void initServerConfig(void) {
getRandomHexChars(server.runid,REDIS_RUN_ID_SIZE); getRandomHexChars(server.runid,REDIS_RUN_ID_SIZE);
server.configfile = NULL; server.configfile = NULL;
server.hz = REDIS_DEFAULT_HZ; server.hz = CONFIG_DEFAULT_HZ;
server.runid[REDIS_RUN_ID_SIZE] = '\0'; server.runid[REDIS_RUN_ID_SIZE] = '\0';
server.arch_bits = (sizeof(long) == 8) ? 64 : 32; server.arch_bits = (sizeof(long) == 8) ? 64 : 32;
server.port = REDIS_SERVERPORT; server.port = REDIS_SERVERPORT;
server.tcp_backlog = REDIS_TCP_BACKLOG; server.tcp_backlog = REDIS_TCP_BACKLOG;
server.bindaddr_count = 0; server.bindaddr_count = 0;
server.unixsocket = NULL; server.unixsocket = NULL;
server.unixsocketperm = REDIS_DEFAULT_UNIX_SOCKET_PERM; server.unixsocketperm = CONFIG_DEFAULT_UNIX_SOCKET_PERM;
server.ipfd_count = 0; server.ipfd_count = 0;
server.sofd = -1; server.sofd = -1;
server.dbnum = REDIS_DEFAULT_DBNUM; server.dbnum = CONFIG_DEFAULT_DBNUM;
server.verbosity = REDIS_DEFAULT_VERBOSITY; server.verbosity = CONFIG_DEFAULT_VERBOSITY;
server.maxidletime = REDIS_MAXIDLETIME; server.maxidletime = REDIS_MAXIDLETIME;
server.tcpkeepalive = REDIS_DEFAULT_TCP_KEEPALIVE; server.tcpkeepalive = CONFIG_DEFAULT_TCP_KEEPALIVE;
server.active_expire_enabled = 1; server.active_expire_enabled = 1;
server.client_max_querybuf_len = REDIS_MAX_QUERYBUF_LEN; server.client_max_querybuf_len = REDIS_MAX_QUERYBUF_LEN;
server.saveparams = NULL; server.saveparams = NULL;
server.loading = 0; server.loading = 0;
server.logfile = zstrdup(REDIS_DEFAULT_LOGFILE); server.logfile = zstrdup(CONFIG_DEFAULT_LOGFILE);
server.syslog_enabled = REDIS_DEFAULT_SYSLOG_ENABLED; server.syslog_enabled = CONFIG_DEFAULT_SYSLOG_ENABLED;
server.syslog_ident = zstrdup(REDIS_DEFAULT_SYSLOG_IDENT); server.syslog_ident = zstrdup(CONFIG_DEFAULT_SYSLOG_IDENT);
server.syslog_facility = LOG_LOCAL0; server.syslog_facility = LOG_LOCAL0;
server.daemonize = REDIS_DEFAULT_DAEMONIZE; server.daemonize = CONFIG_DEFAULT_DAEMONIZE;
server.supervised = 0; server.supervised = 0;
server.supervised_mode = REDIS_SUPERVISED_NONE; server.supervised_mode = REDIS_SUPERVISED_NONE;
server.aof_state = REDIS_AOF_OFF; server.aof_state = REDIS_AOF_OFF;
server.aof_fsync = REDIS_DEFAULT_AOF_FSYNC; server.aof_fsync = CONFIG_DEFAULT_AOF_FSYNC;
server.aof_no_fsync_on_rewrite = REDIS_DEFAULT_AOF_NO_FSYNC_ON_REWRITE; server.aof_no_fsync_on_rewrite = CONFIG_DEFAULT_AOF_NO_FSYNC_ON_REWRITE;
server.aof_rewrite_perc = REDIS_AOF_REWRITE_PERC; server.aof_rewrite_perc = REDIS_AOF_REWRITE_PERC;
server.aof_rewrite_min_size = REDIS_AOF_REWRITE_MIN_SIZE; server.aof_rewrite_min_size = REDIS_AOF_REWRITE_MIN_SIZE;
server.aof_rewrite_base_size = 0; server.aof_rewrite_base_size = 0;
...@@ -1456,22 +1456,22 @@ void initServerConfig(void) { ...@@ -1456,22 +1456,22 @@ void initServerConfig(void) {
server.aof_fd = -1; server.aof_fd = -1;
server.aof_selected_db = -1; /* Make sure the first time will not match */ server.aof_selected_db = -1; /* Make sure the first time will not match */
server.aof_flush_postponed_start = 0; server.aof_flush_postponed_start = 0;
server.aof_rewrite_incremental_fsync = REDIS_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC; server.aof_rewrite_incremental_fsync = CONFIG_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC;
server.aof_load_truncated = REDIS_DEFAULT_AOF_LOAD_TRUNCATED; server.aof_load_truncated = CONFIG_DEFAULT_AOF_LOAD_TRUNCATED;
server.pidfile = NULL; server.pidfile = NULL;
server.rdb_filename = zstrdup(REDIS_DEFAULT_RDB_FILENAME); server.rdb_filename = zstrdup(CONFIG_DEFAULT_RDB_FILENAME);
server.aof_filename = zstrdup(REDIS_DEFAULT_AOF_FILENAME); server.aof_filename = zstrdup(CONFIG_DEFAULT_AOF_FILENAME);
server.requirepass = NULL; server.requirepass = NULL;
server.rdb_compression = REDIS_DEFAULT_RDB_COMPRESSION; server.rdb_compression = CONFIG_DEFAULT_RDB_COMPRESSION;
server.rdb_checksum = REDIS_DEFAULT_RDB_CHECKSUM; server.rdb_checksum = CONFIG_DEFAULT_RDB_CHECKSUM;
server.stop_writes_on_bgsave_err = REDIS_DEFAULT_STOP_WRITES_ON_BGSAVE_ERROR; server.stop_writes_on_bgsave_err = CONFIG_DEFAULT_STOP_WRITES_ON_BGSAVE_ERROR;
server.activerehashing = REDIS_DEFAULT_ACTIVE_REHASHING; server.activerehashing = CONFIG_DEFAULT_ACTIVE_REHASHING;
server.notify_keyspace_events = 0; server.notify_keyspace_events = 0;
server.maxclients = REDIS_MAX_CLIENTS; server.maxclients = CONFIG_DEFAULT_MAX_CLIENTS;
server.bpop_blocked_clients = 0; server.bpop_blocked_clients = 0;
server.maxmemory = REDIS_DEFAULT_MAXMEMORY; server.maxmemory = CONFIG_DEFAULT_MAXMEMORY;
server.maxmemory_policy = REDIS_DEFAULT_MAXMEMORY_POLICY; server.maxmemory_policy = CONFIG_DEFAULT_MAXMEMORY_POLICY;
server.maxmemory_samples = REDIS_DEFAULT_MAXMEMORY_SAMPLES; server.maxmemory_samples = CONFIG_DEFAULT_MAXMEMORY_SAMPLES;
server.hash_max_ziplist_entries = REDIS_HASH_MAX_ZIPLIST_ENTRIES; server.hash_max_ziplist_entries = REDIS_HASH_MAX_ZIPLIST_ENTRIES;
server.hash_max_ziplist_value = REDIS_HASH_MAX_ZIPLIST_VALUE; server.hash_max_ziplist_value = REDIS_HASH_MAX_ZIPLIST_VALUE;
server.list_max_ziplist_size = REDIS_LIST_MAX_ZIPLIST_SIZE; server.list_max_ziplist_size = REDIS_LIST_MAX_ZIPLIST_SIZE;
...@@ -1479,18 +1479,18 @@ void initServerConfig(void) { ...@@ -1479,18 +1479,18 @@ void initServerConfig(void) {
server.set_max_intset_entries = REDIS_SET_MAX_INTSET_ENTRIES; server.set_max_intset_entries = REDIS_SET_MAX_INTSET_ENTRIES;
server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES; server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES;
server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE; server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE;
server.hll_sparse_max_bytes = REDIS_DEFAULT_HLL_SPARSE_MAX_BYTES; server.hll_sparse_max_bytes = CONFIG_DEFAULT_HLL_SPARSE_MAX_BYTES;
server.shutdown_asap = 0; server.shutdown_asap = 0;
server.repl_ping_slave_period = REDIS_REPL_PING_SLAVE_PERIOD; server.repl_ping_slave_period = REDIS_REPL_PING_SLAVE_PERIOD;
server.repl_timeout = REDIS_REPL_TIMEOUT; server.repl_timeout = REDIS_REPL_TIMEOUT;
server.repl_min_slaves_to_write = REDIS_DEFAULT_MIN_SLAVES_TO_WRITE; server.repl_min_slaves_to_write = CONFIG_DEFAULT_MIN_SLAVES_TO_WRITE;
server.repl_min_slaves_max_lag = REDIS_DEFAULT_MIN_SLAVES_MAX_LAG; server.repl_min_slaves_max_lag = CONFIG_DEFAULT_MIN_SLAVES_MAX_LAG;
server.cluster_enabled = 0; server.cluster_enabled = 0;
server.cluster_node_timeout = REDIS_CLUSTER_DEFAULT_NODE_TIMEOUT; server.cluster_node_timeout = REDIS_CLUSTER_DEFAULT_NODE_TIMEOUT;
server.cluster_migration_barrier = REDIS_CLUSTER_DEFAULT_MIGRATION_BARRIER; server.cluster_migration_barrier = REDIS_CLUSTER_DEFAULT_MIGRATION_BARRIER;
server.cluster_slave_validity_factor = REDIS_CLUSTER_DEFAULT_SLAVE_VALIDITY; server.cluster_slave_validity_factor = REDIS_CLUSTER_DEFAULT_SLAVE_VALIDITY;
server.cluster_require_full_coverage = REDIS_CLUSTER_DEFAULT_REQUIRE_FULL_COVERAGE; server.cluster_require_full_coverage = REDIS_CLUSTER_DEFAULT_REQUIRE_FULL_COVERAGE;
server.cluster_configfile = zstrdup(REDIS_DEFAULT_CLUSTER_CONFIG_FILE); server.cluster_configfile = zstrdup(CONFIG_DEFAULT_CLUSTER_CONFIG_FILE);
server.lua_caller = NULL; server.lua_caller = NULL;
server.lua_time_limit = REDIS_LUA_TIME_LIMIT; server.lua_time_limit = REDIS_LUA_TIME_LIMIT;
server.lua_client = NULL; server.lua_client = NULL;
...@@ -1514,22 +1514,22 @@ void initServerConfig(void) { ...@@ -1514,22 +1514,22 @@ void initServerConfig(void) {
server.repl_master_initial_offset = -1; server.repl_master_initial_offset = -1;
server.repl_state = REDIS_REPL_NONE; server.repl_state = REDIS_REPL_NONE;
server.repl_syncio_timeout = REDIS_REPL_SYNCIO_TIMEOUT; server.repl_syncio_timeout = REDIS_REPL_SYNCIO_TIMEOUT;
server.repl_serve_stale_data = REDIS_DEFAULT_SLAVE_SERVE_STALE_DATA; server.repl_serve_stale_data = CONFIG_DEFAULT_SLAVE_SERVE_STALE_DATA;
server.repl_slave_ro = REDIS_DEFAULT_SLAVE_READ_ONLY; server.repl_slave_ro = CONFIG_DEFAULT_SLAVE_READ_ONLY;
server.repl_down_since = 0; /* Never connected, repl is down since EVER. */ server.repl_down_since = 0; /* Never connected, repl is down since EVER. */
server.repl_disable_tcp_nodelay = REDIS_DEFAULT_REPL_DISABLE_TCP_NODELAY; server.repl_disable_tcp_nodelay = CONFIG_DEFAULT_REPL_DISABLE_TCP_NODELAY;
server.repl_diskless_sync = REDIS_DEFAULT_REPL_DISKLESS_SYNC; server.repl_diskless_sync = CONFIG_DEFAULT_REPL_DISKLESS_SYNC;
server.repl_diskless_sync_delay = REDIS_DEFAULT_REPL_DISKLESS_SYNC_DELAY; server.repl_diskless_sync_delay = CONFIG_DEFAULT_REPL_DISKLESS_SYNC_DELAY;
server.slave_priority = REDIS_DEFAULT_SLAVE_PRIORITY; server.slave_priority = CONFIG_DEFAULT_SLAVE_PRIORITY;
server.master_repl_offset = 0; server.master_repl_offset = 0;
/* Replication partial resync backlog */ /* Replication partial resync backlog */
server.repl_backlog = NULL; server.repl_backlog = NULL;
server.repl_backlog_size = REDIS_DEFAULT_REPL_BACKLOG_SIZE; server.repl_backlog_size = CONFIG_DEFAULT_REPL_BACKLOG_SIZE;
server.repl_backlog_histlen = 0; server.repl_backlog_histlen = 0;
server.repl_backlog_idx = 0; server.repl_backlog_idx = 0;
server.repl_backlog_off = 0; server.repl_backlog_off = 0;
server.repl_backlog_time_limit = REDIS_DEFAULT_REPL_BACKLOG_TIME_LIMIT; server.repl_backlog_time_limit = CONFIG_DEFAULT_REPL_BACKLOG_TIME_LIMIT;
server.repl_no_slaves_since = time(NULL); server.repl_no_slaves_since = time(NULL);
/* Client output buffer limits */ /* Client output buffer limits */
...@@ -1560,7 +1560,7 @@ void initServerConfig(void) { ...@@ -1560,7 +1560,7 @@ void initServerConfig(void) {
server.slowlog_max_len = REDIS_SLOWLOG_MAX_LEN; server.slowlog_max_len = REDIS_SLOWLOG_MAX_LEN;
/* Latency monitor */ /* Latency monitor */
server.latency_monitor_threshold = REDIS_DEFAULT_LATENCY_MONITOR_THRESHOLD; server.latency_monitor_threshold = CONFIG_DEFAULT_LATENCY_MONITOR_THRESHOLD;
/* Debugging */ /* Debugging */
server.assert_failed = "<no assertion failed>"; server.assert_failed = "<no assertion failed>";
...@@ -3455,7 +3455,7 @@ void linuxMemoryWarnings(void) { ...@@ -3455,7 +3455,7 @@ void linuxMemoryWarnings(void) {
void createPidFile(void) { void createPidFile(void) {
/* If pidfile requested, but no pidfile defined, use /* If pidfile requested, but no pidfile defined, use
* default pidfile path */ * default pidfile path */
if (!server.pidfile) server.pidfile = zstrdup(REDIS_DEFAULT_PID_FILE); if (!server.pidfile) server.pidfile = zstrdup(CONFIG_DEFAULT_PID_FILE);
/* Try to write the pid file in a best-effort way. */ /* Try to write the pid file in a best-effort way. */
FILE *fp = fopen(server.pidfile,"w"); FILE *fp = fopen(server.pidfile,"w");
......
...@@ -75,13 +75,13 @@ typedef long long mstime_t; /* millisecond time type. */ ...@@ -75,13 +75,13 @@ typedef long long mstime_t; /* millisecond time type. */
#define REDIS_ERR -1 #define REDIS_ERR -1
/* Static server configuration */ /* Static server configuration */
#define REDIS_DEFAULT_HZ 10 /* Time interrupt calls/sec. */ #define CONFIG_DEFAULT_HZ 10 /* Time interrupt calls/sec. */
#define REDIS_MIN_HZ 1 #define REDIS_MIN_HZ 1
#define REDIS_MAX_HZ 500 #define REDIS_MAX_HZ 500
#define REDIS_SERVERPORT 6379 /* TCP port */ #define REDIS_SERVERPORT 6379 /* TCP port */
#define REDIS_TCP_BACKLOG 511 /* TCP listen backlog */ #define REDIS_TCP_BACKLOG 511 /* TCP listen backlog */
#define REDIS_MAXIDLETIME 0 /* default client timeout: infinite */ #define REDIS_MAXIDLETIME 0 /* default client timeout: infinite */
#define REDIS_DEFAULT_DBNUM 16 #define CONFIG_DEFAULT_DBNUM 16
#define REDIS_CONFIGLINE_MAX 1024 #define REDIS_CONFIGLINE_MAX 1024
#define REDIS_DBCRON_DBS_PER_CALL 16 #define REDIS_DBCRON_DBS_PER_CALL 16
#define REDIS_MAX_WRITE_PER_EVENT (1024*64) #define REDIS_MAX_WRITE_PER_EVENT (1024*64)
...@@ -94,48 +94,48 @@ typedef long long mstime_t; /* millisecond time type. */ ...@@ -94,48 +94,48 @@ typedef long long mstime_t; /* millisecond time type. */
#define REDIS_AOF_REWRITE_ITEMS_PER_CMD 64 #define REDIS_AOF_REWRITE_ITEMS_PER_CMD 64
#define REDIS_SLOWLOG_LOG_SLOWER_THAN 10000 #define REDIS_SLOWLOG_LOG_SLOWER_THAN 10000
#define REDIS_SLOWLOG_MAX_LEN 128 #define REDIS_SLOWLOG_MAX_LEN 128
#define REDIS_MAX_CLIENTS 10000 #define CONFIG_DEFAULT_MAX_CLIENTS 10000
#define REDIS_AUTHPASS_MAX_LEN 512 #define REDIS_AUTHPASS_MAX_LEN 512
#define REDIS_DEFAULT_SLAVE_PRIORITY 100 #define CONFIG_DEFAULT_SLAVE_PRIORITY 100
#define REDIS_REPL_TIMEOUT 60 #define REDIS_REPL_TIMEOUT 60
#define REDIS_REPL_PING_SLAVE_PERIOD 10 #define REDIS_REPL_PING_SLAVE_PERIOD 10
#define REDIS_RUN_ID_SIZE 40 #define REDIS_RUN_ID_SIZE 40
#define REDIS_EOF_MARK_SIZE 40 #define REDIS_EOF_MARK_SIZE 40
#define REDIS_DEFAULT_REPL_BACKLOG_SIZE (1024*1024) /* 1mb */ #define CONFIG_DEFAULT_REPL_BACKLOG_SIZE (1024*1024) /* 1mb */
#define REDIS_DEFAULT_REPL_BACKLOG_TIME_LIMIT (60*60) /* 1 hour */ #define CONFIG_DEFAULT_REPL_BACKLOG_TIME_LIMIT (60*60) /* 1 hour */
#define REDIS_REPL_BACKLOG_MIN_SIZE (1024*16) /* 16k */ #define REDIS_REPL_BACKLOG_MIN_SIZE (1024*16) /* 16k */
#define REDIS_BGSAVE_RETRY_DELAY 5 /* Wait a few secs before trying again. */ #define REDIS_BGSAVE_RETRY_DELAY 5 /* Wait a few secs before trying again. */
#define REDIS_DEFAULT_PID_FILE "/var/run/redis.pid" #define CONFIG_DEFAULT_PID_FILE "/var/run/redis.pid"
#define REDIS_DEFAULT_SYSLOG_IDENT "redis" #define CONFIG_DEFAULT_SYSLOG_IDENT "redis"
#define REDIS_DEFAULT_CLUSTER_CONFIG_FILE "nodes.conf" #define CONFIG_DEFAULT_CLUSTER_CONFIG_FILE "nodes.conf"
#define REDIS_DEFAULT_DAEMONIZE 0 #define CONFIG_DEFAULT_DAEMONIZE 0
#define REDIS_DEFAULT_UNIX_SOCKET_PERM 0 #define CONFIG_DEFAULT_UNIX_SOCKET_PERM 0
#define REDIS_DEFAULT_TCP_KEEPALIVE 0 #define CONFIG_DEFAULT_TCP_KEEPALIVE 0
#define REDIS_DEFAULT_LOGFILE "" #define CONFIG_DEFAULT_LOGFILE ""
#define REDIS_DEFAULT_SYSLOG_ENABLED 0 #define CONFIG_DEFAULT_SYSLOG_ENABLED 0
#define REDIS_DEFAULT_STOP_WRITES_ON_BGSAVE_ERROR 1 #define CONFIG_DEFAULT_STOP_WRITES_ON_BGSAVE_ERROR 1
#define REDIS_DEFAULT_RDB_COMPRESSION 1 #define CONFIG_DEFAULT_RDB_COMPRESSION 1
#define REDIS_DEFAULT_RDB_CHECKSUM 1 #define CONFIG_DEFAULT_RDB_CHECKSUM 1
#define REDIS_DEFAULT_RDB_FILENAME "dump.rdb" #define CONFIG_DEFAULT_RDB_FILENAME "dump.rdb"
#define REDIS_DEFAULT_REPL_DISKLESS_SYNC 0 #define CONFIG_DEFAULT_REPL_DISKLESS_SYNC 0
#define REDIS_DEFAULT_REPL_DISKLESS_SYNC_DELAY 5 #define CONFIG_DEFAULT_REPL_DISKLESS_SYNC_DELAY 5
#define REDIS_DEFAULT_SLAVE_SERVE_STALE_DATA 1 #define CONFIG_DEFAULT_SLAVE_SERVE_STALE_DATA 1
#define REDIS_DEFAULT_SLAVE_READ_ONLY 1 #define CONFIG_DEFAULT_SLAVE_READ_ONLY 1
#define REDIS_DEFAULT_REPL_DISABLE_TCP_NODELAY 0 #define CONFIG_DEFAULT_REPL_DISABLE_TCP_NODELAY 0
#define REDIS_DEFAULT_MAXMEMORY 0 #define CONFIG_DEFAULT_MAXMEMORY 0
#define REDIS_DEFAULT_MAXMEMORY_SAMPLES 5 #define CONFIG_DEFAULT_MAXMEMORY_SAMPLES 5
#define REDIS_DEFAULT_AOF_FILENAME "appendonly.aof" #define CONFIG_DEFAULT_AOF_FILENAME "appendonly.aof"
#define REDIS_DEFAULT_AOF_NO_FSYNC_ON_REWRITE 0 #define CONFIG_DEFAULT_AOF_NO_FSYNC_ON_REWRITE 0
#define REDIS_DEFAULT_AOF_LOAD_TRUNCATED 1 #define CONFIG_DEFAULT_AOF_LOAD_TRUNCATED 1
#define REDIS_DEFAULT_ACTIVE_REHASHING 1 #define CONFIG_DEFAULT_ACTIVE_REHASHING 1
#define REDIS_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC 1 #define CONFIG_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC 1
#define REDIS_DEFAULT_MIN_SLAVES_TO_WRITE 0 #define CONFIG_DEFAULT_MIN_SLAVES_TO_WRITE 0
#define REDIS_DEFAULT_MIN_SLAVES_MAX_LAG 10 #define CONFIG_DEFAULT_MIN_SLAVES_MAX_LAG 10
#define REDIS_IP_STR_LEN 46 /* INET6_ADDRSTRLEN is 46, but we need to be sure */ #define REDIS_IP_STR_LEN 46 /* INET6_ADDRSTRLEN is 46, but we need to be sure */
#define REDIS_PEER_ID_LEN (REDIS_IP_STR_LEN+32) /* Must be enough for ip:port */ #define REDIS_PEER_ID_LEN (REDIS_IP_STR_LEN+32) /* Must be enough for ip:port */
#define REDIS_BINDADDR_MAX 16 #define REDIS_BINDADDR_MAX 16
#define REDIS_MIN_RESERVED_FDS 32 #define REDIS_MIN_RESERVED_FDS 32
#define REDIS_DEFAULT_LATENCY_MONITOR_THRESHOLD 0 #define CONFIG_DEFAULT_LATENCY_MONITOR_THRESHOLD 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 */
...@@ -312,7 +312,7 @@ typedef long long mstime_t; /* millisecond time type. */ ...@@ -312,7 +312,7 @@ typedef long long mstime_t; /* millisecond time type. */
#define REDIS_NOTICE 2 #define REDIS_NOTICE 2
#define REDIS_WARNING 3 #define REDIS_WARNING 3
#define REDIS_LOG_RAW (1<<10) /* Modifier to log without timestamp */ #define REDIS_LOG_RAW (1<<10) /* Modifier to log without timestamp */
#define REDIS_DEFAULT_VERBOSITY REDIS_NOTICE #define CONFIG_DEFAULT_VERBOSITY REDIS_NOTICE
/* Supervision options */ /* Supervision options */
#define REDIS_SUPERVISED_NONE 0 #define REDIS_SUPERVISED_NONE 0
...@@ -330,7 +330,7 @@ typedef long long mstime_t; /* millisecond time type. */ ...@@ -330,7 +330,7 @@ typedef long long mstime_t; /* millisecond time type. */
#define AOF_FSYNC_NO 0 #define AOF_FSYNC_NO 0
#define AOF_FSYNC_ALWAYS 1 #define AOF_FSYNC_ALWAYS 1
#define AOF_FSYNC_EVERYSEC 2 #define AOF_FSYNC_EVERYSEC 2
#define REDIS_DEFAULT_AOF_FSYNC AOF_FSYNC_EVERYSEC #define CONFIG_DEFAULT_AOF_FSYNC AOF_FSYNC_EVERYSEC
/* Zip structure related defaults */ /* Zip structure related defaults */
#define REDIS_HASH_MAX_ZIPLIST_ENTRIES 512 #define REDIS_HASH_MAX_ZIPLIST_ENTRIES 512
...@@ -344,7 +344,7 @@ typedef long long mstime_t; /* millisecond time type. */ ...@@ -344,7 +344,7 @@ typedef long long mstime_t; /* millisecond time type. */
#define REDIS_LIST_COMPRESS_DEPTH 0 #define REDIS_LIST_COMPRESS_DEPTH 0
/* HyperLogLog defines */ /* HyperLogLog defines */
#define REDIS_DEFAULT_HLL_SPARSE_MAX_BYTES 3000 #define CONFIG_DEFAULT_HLL_SPARSE_MAX_BYTES 3000
/* Sets operations codes */ /* Sets operations codes */
#define REDIS_OP_UNION 0 #define REDIS_OP_UNION 0
...@@ -358,7 +358,7 @@ typedef long long mstime_t; /* millisecond time type. */ ...@@ -358,7 +358,7 @@ typedef long long mstime_t; /* millisecond time type. */
#define REDIS_MAXMEMORY_ALLKEYS_LRU 3 #define REDIS_MAXMEMORY_ALLKEYS_LRU 3
#define REDIS_MAXMEMORY_ALLKEYS_RANDOM 4 #define REDIS_MAXMEMORY_ALLKEYS_RANDOM 4
#define REDIS_MAXMEMORY_NO_EVICTION 5 #define REDIS_MAXMEMORY_NO_EVICTION 5
#define REDIS_DEFAULT_MAXMEMORY_POLICY REDIS_MAXMEMORY_NO_EVICTION #define CONFIG_DEFAULT_MAXMEMORY_POLICY REDIS_MAXMEMORY_NO_EVICTION
/* Scripting */ /* Scripting */
#define REDIS_LUA_TIME_LIMIT 5000 /* milliseconds */ #define REDIS_LUA_TIME_LIMIT 5000 /* milliseconds */
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
*/ */
#include "redis.h" #include "server.h"
#include "slowlog.h" #include "slowlog.h"
/* Create a new slowlog entry. /* Create a new slowlog entry.
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
#include "redis.h" #include "server.h"
#include "pqsort.h" /* Partial qsort for SORT+LIMIT */ #include "pqsort.h" /* Partial qsort for SORT+LIMIT */
#include <math.h> /* isnan() */ #include <math.h> /* isnan() */
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
#include <math.h> #include <math.h>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
/* ----------------- Blocking sockets I/O with timeouts --------------------- */ /* ----------------- Blocking sockets I/O with timeouts --------------------- */
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
#include <math.h> #include <math.h>
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* List API * List API
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Set Commands * Set Commands
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redis.h" #include "server.h"
#include <math.h> /* isnan(), isinf() */ #include <math.h> /* isnan(), isinf() */
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
* pointers being only at "level 1". This allows to traverse the list * pointers being only at "level 1". This allows to traverse the list
* from tail to head, useful for ZREVRANGE. */ * from tail to head, useful for ZREVRANGE. */
#include "redis.h" #include "server.h"
#include <math.h> #include <math.h>
static int zslLexValueGteMin(robj *value, zlexrangespec *spec); static int zslLexValueGteMin(robj *value, zlexrangespec *spec);
......
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