[fix] bug of expiration

Author: warrick1016

src/db.c

@@ -216,7 +216,11 @@ kvobj *lookupKey(redisDb *db, robj *key, int flags, dictEntryLink *link) {
             expire_flags |= EXPIRE_AVOID_DELETE_EXPIRED;
         if (flags & LOOKUP_ACCESS_EXPIRED)
             expire_flags |= EXPIRE_ALLOW_ACCESS_EXPIRED;
+#ifdef ENABLE_SWAP
+        if (expireIfNeeded(db, key, val, expire_flags) == KEY_DELETED) {
+#else
         if (expireIfNeeded(db, key, val, expire_flags) != KEY_VALID) {
+#endif
             /* The key is no longer valid. */
             val = NULL;
             if (link) *link = NULL;

tests/swap/unit/select.tcl

@@ -195,7 +195,17 @@ start_server {overrides {save ""} tags {"swap" "select"}} {
             $slave select 1
             assert_equal [$slave get key] db1
 
-            after 1000
+            $slave select 0
+            assert {[$slave pttl key] > 0}
+            $slave select 1
+            assert {[$slave pttl key] > 0}
+
+            after 1500
+
+            $slave select 0
+            assert {[$slave pttl key] <= 0}
+            $slave select 1
+            assert {[$slave pttl key] <= 0}
 
             $slave select 0
             assert_equal [$slave get key] {}