more generally usable i/o functions moved to syncio.c

[redis.git] / src / db.c

diff --git a/src/db.c b/src/db.c
index 445078474c9fa666a98baf77d20fbc150a5f655d..a39a03bbfea676b4aaef8dbe43ab53140a376c7c 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -11,6 +11,9 @@ robj *lookupKey(redisDb *db, robj *key) {
     if (de) {
         robj *val = dictGetEntryVal(de);
 
     if (de) {
         robj *val = dictGetEntryVal(de);
 

+        /* Update the access time for the aging algorithm. */
+        val->lru = server.lruclock;
+

         if (server.vm_enabled) {
             if (val->storage == REDIS_VM_MEMORY ||
                 val->storage == REDIS_VM_SWAPPING)
         if (server.vm_enabled) {
             if (val->storage == REDIS_VM_MEMORY ||
                 val->storage == REDIS_VM_SWAPPING)


@@ -18,8 +21,6 @@ robj *lookupKey(redisDb *db, robj *key) {
                 /* If we were swapping the object out, cancel the operation */
                 if (val->storage == REDIS_VM_SWAPPING)
                     vmCancelThreadedIOJob(val);
                 /* If we were swapping the object out, cancel the operation */
                 if (val->storage == REDIS_VM_SWAPPING)
                     vmCancelThreadedIOJob(val);

-                /* Update the access time for the aging algorithm. */
-                val->lru = server.lruclock;

             } else {
                 int notify = (val->storage == REDIS_VM_LOADING);
 
             } else {
                 int notify = (val->storage == REDIS_VM_LOADING);
 


@@ -33,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;
     }
 }


@@ -467,7 +470,6 @@ int expireIfNeeded(redisDb *db, robj *key) {
 
     /* Delete the key */
     server.stat_expiredkeys++;
 
     /* Delete the key */
     server.stat_expiredkeys++;

-    server.dirty++;

     propagateExpire(db,key);
     return dbDelete(db,key);
 }
     propagateExpire(db,key);
     return dbDelete(db,key);
 }