fixed a bug in diskstore

[redis.git] / src / db.c

diff --git a/src/db.c b/src/db.c
index 8684bb1ab0b7e9bca7418dfbc157558ca065d014..9be26f865667a49c7e2b48eb72ec9f51a6e93549 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -36,14 +36,12 @@ robj *lookupKey(redisDb *db, robj *key) {
          * enabled we may have this key on disk. If so load it in memory
          * in a blocking way. */
         if (server.ds_enabled && cacheKeyMayExist(db,key)) {
          * enabled we may have this key on disk. If so load it in memory
          * in a blocking way. */
         if (server.ds_enabled && cacheKeyMayExist(db,key)) {

-            if (cacheScheduleIOGetFlags(db,key) &
-                 (REDIS_IO_SAVE|REDIS_IO_SAVEINPROG))
-            {
+            if (cacheScheduleIOGetFlags(db,key) & REDIS_IO_SAVEINPROG) {

                 /* There is a save in progress for this object!
                  * Wait for it to get out. */
                 waitEmptyIOJobsQueue();
                 processAllPendingIOJobs();
                 /* There is a save in progress for this object!
                  * Wait for it to get out. */
                 waitEmptyIOJobsQueue();
                 processAllPendingIOJobs();

-                redisAssert((cacheScheduleIOGetFlags(db,key) & (REDIS_IO_SAVE|REDIS_IO_SAVEINPROG)) == 0);
+                redisAssert((cacheScheduleIOGetFlags(db,key) & REDIS_IO_SAVEINPROG) == 0);

             }
 
             redisLog(REDIS_DEBUG,"Force loading key %s via lookup",
             }
 
             redisLog(REDIS_DEBUG,"Force loading key %s via lookup",