Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

trick to avoid creating new memoty when cache is not used

Browse Source
This commit is contained in:
csoler 2021-01-02 22:24:13 +01:00
parent 71f2e273ea
commit aad542e3a5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/gxs/rsdataservice.cc
View File

@ -1265,12 +1265,13 @@ int RsDataService::retrieveGxsMsgMetaData(const GxsMsgReq& reqIds, GxsMsgMetaRes
// if vector empty then request all messages // if vector empty then request all messages
t_MetaDataCache<RsGxsMessageId,RsGxsMsgMetaData>& cache(mMsgMetaDataCache[grpId]); // The pointer here is a trick to not initialize a new cache entry when cache is disabled, while keeping the unique variable all along.
t_MetaDataCache<RsGxsMessageId,RsGxsMsgMetaData> *cache(mUseCache? (&mMsgMetaDataCache[grpId]) : nullptr);
if(msgIdV.empty()) if(msgIdV.empty())
{ {
if(mUseCache && cache.isCacheUpToDate()) if(mUseCache && cache->isCacheUpToDate())
cache.getFullMetaList(msgMeta[grpId]); cache->getFullMetaList(msgMeta[grpId]);
else else
{ {
RetroCursor* c = mDb->sqlQuery(MSG_TABLE_NAME, mMsgMetaColumns, KEY_GRP_ID+ "='" + grpId.toStdString() + "'", ""); RetroCursor* c = mDb->sqlQuery(MSG_TABLE_NAME, mMsgMetaColumns, KEY_GRP_ID+ "='" + grpId.toStdString() + "'", "");
@ -1280,7 +1281,7 @@ int RsDataService::retrieveGxsMsgMetaData(const GxsMsgReq& reqIds, GxsMsgMetaRes
locked_retrieveMsgMetaList(c, msgMeta[grpId]); locked_retrieveMsgMetaList(c, msgMeta[grpId]);
if(mUseCache) if(mUseCache)
cache.setCacheUpToDate(true); cache->setCacheUpToDate(true);
} }
delete c; delete c;
} }
@ -1297,7 +1298,7 @@ int RsDataService::retrieveGxsMsgMetaData(const GxsMsgReq& reqIds, GxsMsgMetaRes
{ {
const RsGxsMessageId& msgId = *sit; const RsGxsMessageId& msgId = *sit;
auto meta = mUseCache?cache.getMeta(msgId): (std::shared_ptr<RsGxsMsgMetaData>()); auto meta = mUseCache?cache->getMeta(msgId): (std::shared_ptr<RsGxsMsgMetaData>());
if(meta) if(meta)
metaSet.push_back(meta); metaSet.push_back(meta);