gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

complete snapshot handling of expires, may still be perf issues

Browse Source 
Former-commit-id: 7c6cf4ba4696ba8a7b4069491e8ad0a583958bdc
This commit is contained in:
John Sully 2019-12-16 22:07:53 -05:00
parent 2e05aa89d0
commit b8015a4c2f
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/snapshot.cpp
View File

@ -47,11 +47,10 @@ const redisDbPersistentDataSnapshot *redisDbPersistentData::createSnapshot(uint6
spdb->m_refCount = 1;
spdb->mvccCheckpoint = getMvccTstamp();
if (m_setexpire != nullptr)
spdb->m_setexpire = m_setexpire;
spdb->m_setexpire = new (MALLOC_LOCAL) expireset(*m_setexpire);
m_pdict = dictCreate(&dbDictType,this);
m_pdictTombstone = dictCreate(&dbDictType, this);
m_setexpire = new (MALLOC_LOCAL) expireset();
serverAssert(spdb->m_pdict->iterators == 1);
@ -197,20 +196,11 @@ void redisDbPersistentData::endSnapshot(const redisDbPersistentDataSnapshot *psn
}
if (dictGetVal(de) != nullptr)
incrRefCount((robj*)dictGetVal(de));
if (o->FExpires() || o == nullptr)
{
auto itr = m_setexpire->find((const char*)dictGetKey(de));
serverAssert(o == nullptr || itr != m_setexpire->end());
if (itr != m_setexpire->end())
m_spdbSnapshotHOLDER->m_setexpire->insert(*itr);
}
}
dictReleaseIterator(di);
// Stage 3 swap the databases with the snapshot
std::swap(m_pdict, m_spdbSnapshotHOLDER->m_pdict);
std::swap(m_setexpire, m_spdbSnapshotHOLDER->m_setexpire);
if (m_spdbSnapshotHOLDER->m_pdbSnapshot != nullptr)
std::swap(m_pdictTombstone, m_spdbSnapshotHOLDER->m_pdictTombstone);