diff options
author | antirez <antirez@gmail.com> | 2017-12-11 15:32:23 +0100 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2017-12-11 15:32:23 +0100 |
commit | 9df64dbc580bb099026ee2899dee7a2295dc69ab (patch) | |
tree | 2262120feb7e39042ba896da9496733c707f368f | |
parent | 3b47d98d2f89bcfda184e0c9825add782f0bdb0a (diff) | |
download | redis-9df64dbc580bb099026ee2899dee7a2295dc69ab.tar.gz |
totalServerKeyCount() -> DbTotalNumberOfKeys().
-rw-r--r-- | src/db.c | 2 | ||||
-rw-r--r-- | src/replication.c | 3 | ||||
-rw-r--r-- | src/server.h | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -361,7 +361,7 @@ int selectDb(client *c, int id) { return C_OK; } -long long totalServerKeyCount() { +long long dbTotalNumberOfKeys() { long long total = 0; int j; for (j = 0; j < server.dbnum; j++) { diff --git a/src/replication.c b/src/replication.c index 485fa9625..ae3b06015 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1110,7 +1110,8 @@ void restartAOF() { int slaveUseDisklessLoading() { return server.repl_diskless_load == REPL_DISKLESS_LOAD_SWAPDB || server.repl_diskless_load == REPL_DISKLESS_LOAD_FLUSHDB || - (server.repl_diskless_load == REPL_DISKLESS_LOAD_WHEN_DB_EMPTY && totalServerKeyCount()==0); + (server.repl_diskless_load == REPL_DISKLESS_LOAD_WHEN_DB_EMPTY && + dbTotalNumberOfKeys()==0); } /* Asynchronously read the SYNC payload we receive from a master */ diff --git a/src/server.h b/src/server.h index afc47043b..fe4087e52 100644 --- a/src/server.h +++ b/src/server.h @@ -1759,7 +1759,7 @@ robj *dbUnshareStringValue(redisDb *db, robj *key, robj *o); #define EMPTYDB_ASYNC (1<<0) /* Reclaim memory in another thread. */ long long emptyDb(int dbnum, int flags, void(callback)(void*)); long long emptyDbGeneric(redisDb* dbarray, int dbnum, int flags, void(callback)(void*)); -long long totalServerKeyCount(); +long long dbTotalNumberOfKeys(); int selectDb(client *c, int id); void signalModifiedKey(redisDb *db, robj *key); |