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

snapshot optimizations

Browse Source 
Former-commit-id: 642f67376a480497554f2891ebfbe7639583c6f1
This commit is contained in:
John Sully 2020-01-31 17:32:48 -05:00
parent 9adc302858
commit e3e64034e2
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/snapshot.cpp
View File

@ -193,19 +193,19 @@ void redisDbPersistentData::endSnapshot(const redisDbPersistentDataSnapshot *psn
while ((de = dictNext(di)) != NULL) while ((de = dictNext(di)) != NULL)
{ {
robj *o = (robj*)dictGetVal(de); robj *o = (robj*)dictGetVal(de);
dictEntry *deExisting = dictFind(m_spdbSnapshotHOLDER->m_pdict, (const char*)dictGetKey(de)); sds newkey = sdsdupshared((sds)dictGetKey(de));
if (deExisting != nullptr) if (dictAdd(m_spdbSnapshotHOLDER->m_pdict, newkey, o) != DICT_OK)
{ {
// Review: We probably shouldn't even be getting into this state because the tombstone processing above should have cleared this out
sdsfree(newkey);
dictEntry *deExisting = dictFind(m_spdbSnapshotHOLDER->m_pdict, (const char*)dictGetKey(de));
serverAssert(deExisting != nullptr);
if (dictGetVal(deExisting) != nullptr) if (dictGetVal(deExisting) != nullptr)
decrRefCount((robj*)dictGetVal(deExisting)); decrRefCount((robj*)dictGetVal(deExisting));
dictSetVal(m_spdbSnapshotHOLDER->m_pdict, deExisting, o); dictSetVal(m_spdbSnapshotHOLDER->m_pdict, deExisting, o);
} }
else
{ dictSetVal(m_pdict, de, nullptr); // remove the object so free'ing the dict doesn't decRef the object
dictAdd(m_spdbSnapshotHOLDER->m_pdict, sdsdupshared((sds)dictGetKey(de)), o);
}
if (dictGetVal(de) != nullptr)
incrRefCount((robj*)dictGetVal(de));
} }
dictReleaseIterator(di); dictReleaseIterator(di);
@ -321,13 +321,7 @@ bool redisDbPersistentDataSnapshot::iterate_threadsafe(std::function<bool(const
__atomic_load(&m_pdbSnapshot, &psnapshot, __ATOMIC_ACQUIRE); __atomic_load(&m_pdbSnapshot, &psnapshot, __ATOMIC_ACQUIRE);
if (fResult && psnapshot != nullptr) if (fResult && psnapshot != nullptr)
{ {
fResult = psnapshot->iterate_threadsafe([this, &fn, &celem](const char *key, robj_roptr o){ fResult = psnapshot->iterate_threadsafe([this, &fn, &celem](const char *key, robj_roptr o){
// Before passing off to the user we need to make sure it's not already in the
// the current set, and not deleted
dictEntry *deCurrent = dictFind(m_pdict, key);
if (deCurrent != nullptr)
return true;
dictEntry *deTombstone = dictFind(m_pdictTombstone, key); dictEntry *deTombstone = dictFind(m_pdictTombstone, key);
if (deTombstone != nullptr) if (deTombstone != nullptr)
return true; return true;