added keyspace_hits and keyspace_misses fields in INFO output

diff --git a/src/db.c b/src/db.c
index da7537f46f35fb6fb0dca9809c91519d67b480e9..a39a03bbfea676b4aaef8dbe43ab53140a376c7c 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -34,8 +34,10 @@ robj *lookupKey(redisDb *db, robj *key) {
                 if (notify) handleClientsBlockedOnSwappedKey(db,key);
             }
         }
                 if (notify) handleClientsBlockedOnSwappedKey(db,key);
             }
         }

+        server.stat_keyspace_hits++;

         return val;
     } else {
         return val;
     } else {

+        server.stat_keyspace_misses++;

         return NULL;
     }
 }
         return NULL;
     }
 }

diff --git a/src/redis.c b/src/redis.c
index 6ce271c05aecde1334a2d75664b3f35f69118507..3defc7f1915c4a1f7c513db6bee4b373213be418 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -823,6 +823,8 @@ void initServer() {
     server.stat_numconnections = 0;
     server.stat_expiredkeys = 0;
     server.stat_starttime = time(NULL);
     server.stat_numconnections = 0;
     server.stat_expiredkeys = 0;
     server.stat_starttime = time(NULL);

+    server.stat_keyspace_misses = 0;
+    server.stat_keyspace_hits = 0;

     server.unixtime = time(NULL);
     aeCreateTimeEvent(server.el, 1, serverCron, NULL, NULL);
     if (aeCreateFileEvent(server.el, server.fd, AE_READABLE,
     server.unixtime = time(NULL);
     aeCreateTimeEvent(server.el, 1, serverCron, NULL, NULL);
     if (aeCreateFileEvent(server.el, server.fd, AE_READABLE,


@@ -1190,6 +1192,8 @@ sds genRedisInfoString(void) {
         "total_connections_received:%lld\r\n"
         "total_commands_processed:%lld\r\n"
         "expired_keys:%lld\r\n"
         "total_connections_received:%lld\r\n"
         "total_commands_processed:%lld\r\n"
         "expired_keys:%lld\r\n"

+        "keyspace_hits:%lld\r\n"
+        "keyspace_misses:%lld\r\n"

         "hash_max_zipmap_entries:%zu\r\n"
         "hash_max_zipmap_value:%zu\r\n"
         "pubsub_channels:%ld\r\n"
         "hash_max_zipmap_entries:%zu\r\n"
         "hash_max_zipmap_value:%zu\r\n"
         "pubsub_channels:%ld\r\n"


@@ -1222,6 +1226,8 @@ sds genRedisInfoString(void) {
         server.stat_numconnections,
         server.stat_numcommands,
         server.stat_expiredkeys,
         server.stat_numconnections,
         server.stat_numcommands,
         server.stat_expiredkeys,

+        server.stat_keyspace_hits,
+        server.stat_keyspace_misses,

         server.hash_max_zipmap_entries,
         server.hash_max_zipmap_value,
         dictSize(server.pubsub_channels),
         server.hash_max_zipmap_entries,
         server.hash_max_zipmap_value,
         dictSize(server.pubsub_channels),

diff --git a/src/redis.h b/src/redis.h
index 9b16b02404ab05bdeffc46588835d63c64c589f1..d6bdcb20a67ecdf972050901d9f720f6b6c61b46 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -357,12 +357,14 @@ struct redisServer {
     aeEventLoop *el;
     int cronloops;              /* number of times the cron function run */
     list *objfreelist;          /* A list of freed objects to avoid malloc() */
     aeEventLoop *el;
     int cronloops;              /* number of times the cron function run */
     list *objfreelist;          /* A list of freed objects to avoid malloc() */

-    time_t lastsave;            /* Unix time of last save succeeede */
+    time_t lastsave;                /* Unix time of last save succeeede */

     /* Fields used only for stats */
     /* Fields used only for stats */

-    time_t stat_starttime;         /* server start time */
-    long long stat_numcommands;    /* number of processed commands */
-    long long stat_numconnections; /* number of connections received */
-    long long stat_expiredkeys;   /* number of expired keys */
+    time_t stat_starttime;          /* server start time */
+    long long stat_numcommands;     /* number of processed commands */
+    long long stat_numconnections;  /* number of connections received */
+    long long stat_expiredkeys;     /* number of expired keys */
+    long long stat_keyspace_hits;   /* number of successful lookups of keys */
+    long long stat_keyspace_misses; /* number of failed lookups of keys */

     /* Configuration */
     int verbosity;
     int glueoutputbuf;
     /* Configuration */
     int verbosity;
     int glueoutputbuf;