Merge branch 'keydbpro' into PRO_RELEASE_6

Former-commit-id: cf7ed118553af55a27c3a57c121bc26e18e0ab7e
This commit is contained in:
Ben Schermel 2020-06-16 14:16:03 -04:00
commit e0d2a1cff6

View File

@ -60,9 +60,10 @@ bool redisDbPersistentData::asyncDelete(robj *key) {
return syncDelete(key); // async delte never makes sense with a storage provider
dictEntry *de = dictUnlink(m_pdict,ptrFromObj(key));
if (de) {
if (m_pdbSnapshot != nullptr && m_pdbSnapshot->find_cached_threadsafe(szFromObj(key)) != nullptr)
dictAdd(m_pdictTombstone, sdsdup((sds)dictGetKey(de)), nullptr);
if (de) {
robj *val = (robj*)dictGetVal(de);
if (val->FExpires())
{