Expire entry needs to be resorted after a subkey expires

Former-commit-id: b357803362728c26a1169e3cec279c693b86205b
2020-03-25 01:06:40 -04:00 · 2020-03-25 01:06:40 -04:00 · 70faf2f375
commit 70faf2f375
parent b057a9cd7a
1 changed files with 9 additions and 0 deletions
--- a/src/expire.cpp
+++ b/src/expire.cpp
@ -135,6 +135,15 @@ void activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now) {

    if (deleted)
    {
+        if (!pfat->FEmpty())
+        {
+            // We need to resort the expire entry since it may no longer be in the correct position
+            auto itr = db->setexpire->find(e.key());
+            expireEntry eT = std::move(e);
+            db->setexpire->erase(itr);
+            db->setexpire->insert(eT);
+        }
+
        robj objT;
        switch (val->type)
        {