tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

RedisWriter#InsertObjectDependencies(): reduce memory allocations

Browse Source
This commit is contained in:
Alexander A. Klimov 2019-06-27 17:28:00 +02:00 committed by Michael Friedrich
parent def3c7df32
commit 1d126b66e9
1 changed files with 121 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
lib/redis/rediswriter-objects.cpp
View File

@ -313,19 +313,26 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
if (customVarObject) { if (customVarObject) {
auto vars(SerializeVars(customVarObject)); auto vars(SerializeVars(customVarObject));
if (vars) { if (vars) {
statements[m_PrefixConfigCheckSum + typeName + ":customvar"].emplace_back(objectKey); auto& typeCvs (statements.at(m_PrefixConfigObject + typeName + ":customvar"));
statements[m_PrefixConfigCheckSum + typeName + ":customvar"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumVars(customVarObject)}}))); auto& allCvs (statements.at(m_PrefixConfigObject + "customvar"));
auto& cvChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":customvar"));
cvChksms.emplace_back(objectKey);
cvChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumVars(customVarObject)}})));
ObjectLock varsLock(vars); ObjectLock varsLock(vars);
Array::Ptr varsArray(new Array); Array::Ptr varsArray(new Array);
varsArray->Reserve(vars->GetLength());
for (auto& kv : vars) { for (auto& kv : vars) {
statements[m_PrefixConfigObject + "customvar"].emplace_back(kv.first); allCvs.emplace_back(kv.first);
statements[m_PrefixConfigObject + "customvar"].emplace_back(JsonEncode(kv.second)); allCvs.emplace_back(JsonEncode(kv.second));
varsArray->Add(kv.first); varsArray->Add(kv.first);
} }
statements[m_PrefixConfigObject + typeName + ":customvar"].emplace_back(objectKey); typeCvs.emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":customvar"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"customvars", varsArray}}))); typeCvs.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"customvars", varsArray}})));
} }
} }
@ -337,16 +344,19 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
String notesUrl = checkable->GetNotesUrl(); String notesUrl = checkable->GetNotesUrl();
String iconImage = checkable->GetIconImage(); String iconImage = checkable->GetIconImage();
if (!actionUrl.IsEmpty()) { if (!actionUrl.IsEmpty()) {
statements[m_PrefixConfigObject + "action_url"].emplace_back(CalculateCheckSumArray(new Array({envId, actionUrl}))); auto& actionUrls (statements.at(m_PrefixConfigObject + "action_url"));
statements[m_PrefixConfigObject + "action_url"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"action_url", actionUrl}}))); actionUrls.emplace_back(CalculateCheckSumArray(new Array({envId, actionUrl})));
actionUrls.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"action_url", actionUrl}})));
} }
if (!notesUrl.IsEmpty()) { if (!notesUrl.IsEmpty()) {
statements[m_PrefixConfigObject + "notes_url"].emplace_back(CalculateCheckSumArray(new Array({envId, notesUrl}))); auto& notesUrls (statements.at(m_PrefixConfigObject + "notes_url"));
statements[m_PrefixConfigObject + "notes_url"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"notes_url", notesUrl}}))); notesUrls.emplace_back(CalculateCheckSumArray(new Array({envId, notesUrl})));
notesUrls.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"notes_url", notesUrl}})));
} }
if (!iconImage.IsEmpty()) { if (!iconImage.IsEmpty()) {
statements[m_PrefixConfigObject + "icon_image"].emplace_back(CalculateCheckSumArray(new Array({envId, iconImage}))); auto& iconImages (statements.at(m_PrefixConfigObject + "icon_image"));
statements[m_PrefixConfigObject + "icon_image"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"icon_image", iconImage}}))); iconImages.emplace_back(CalculateCheckSumArray(new Array({envId, iconImage})));
iconImages.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"icon_image", iconImage}})));
} }
Host::Ptr host; Host::Ptr host;
@ -366,14 +376,20 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
if (groups) { if (groups) {
ObjectLock groupsLock(groups); ObjectLock groupsLock(groups);
Array::Ptr groupIds(new Array); Array::Ptr groupIds(new Array);
groupIds->Reserve(groups->GetLength());
for (auto& group : groups) { for (auto& group : groups) {
groupIds->Add(GetObjectIdentifier((*getGroup)(group))); groupIds->Add(GetObjectIdentifier((*getGroup)(group)));
} }
statements[m_PrefixConfigCheckSum + typeName + ":groupmember"].emplace_back(objectKey); auto& members (statements.at(m_PrefixConfigObject + typeName + ":groupmember"));
statements[m_PrefixConfigCheckSum + typeName + ":groupmember"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(groupIds)}}))); auto& memberChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":groupmember"));
statements[m_PrefixConfigObject + typeName + ":groupmember"].emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":groupmember"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"groups", groupIds}}))); memberChksms.emplace_back(objectKey);
memberChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(groupIds)}})));
members.emplace_back(objectKey);
members.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"groups", groupIds}})));
} }
return; return;
@ -386,18 +402,24 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
if (ranges) { if (ranges) {
ObjectLock rangesLock(ranges); ObjectLock rangesLock(ranges);
Array::Ptr rangeIds(new Array); Array::Ptr rangeIds(new Array);
auto& typeRanges (statements.at(m_PrefixConfigObject + typeName + ":range"));
auto& allRanges (statements.at(m_PrefixConfigObject + "timerange"));
auto& rangeChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":range"));
rangeIds->Reserve(ranges->GetLength());
for (auto& kv : ranges) { for (auto& kv : ranges) {
String id = CalculateCheckSumArray(new Array({envId, kv.first, kv.second})); String id = CalculateCheckSumArray(new Array({envId, kv.first, kv.second}));
rangeIds->Add(id); rangeIds->Add(id);
statements[m_PrefixConfigObject + "timerange"].emplace_back(id); allRanges.emplace_back(id);
statements[m_PrefixConfigObject + "timerange"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"range_key", kv.first}, {"range_value", kv.second}}))); allRanges.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"range_key", kv.first}, {"range_value", kv.second}})));
} }
statements[m_PrefixConfigCheckSum + typeName + ":range"].emplace_back(objectKey); rangeChksms.emplace_back(objectKey);
statements[m_PrefixConfigCheckSum + typeName + ":range"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(rangeIds)}}))); rangeChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(rangeIds)}})));
statements[m_PrefixConfigObject + typeName + ":range"].emplace_back(objectKey); typeRanges.emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":range"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"ranges", rangeIds}}))); typeRanges.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"ranges", rangeIds}})));
} }
Array::Ptr includes; Array::Ptr includes;
@ -410,14 +432,19 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
ObjectLock includesLock(includes); ObjectLock includesLock(includes);
ObjectLock includeChecksumsLock(includeChecksums); ObjectLock includeChecksumsLock(includeChecksums);
includeChecksums->Reserve(includes->GetLength());
for (auto include : includes) { for (auto include : includes) {
includeChecksums->Add(GetObjectIdentifier((*getInclude)(include.Get<String>()))); includeChecksums->Add(GetObjectIdentifier((*getInclude)(include.Get<String>())));
} }
statements[m_PrefixConfigCheckSum + typeName + ":overwrite:include"].emplace_back(objectKey); auto& includs (statements.at(m_PrefixConfigObject + typeName + ":overwrite:include"));
statements[m_PrefixConfigCheckSum + typeName + ":overwrite:include"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(includes)}}))); auto& includeChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":overwrite:include"));
statements[m_PrefixConfigObject + typeName + ":overwrite:include"].emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":overwrite:include"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"includes", includeChecksums}}))); includeChksms.emplace_back(objectKey);
includeChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(includes)}})));
includs.emplace_back(objectKey);
includs.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"includes", includeChecksums}})));
Array::Ptr excludes; Array::Ptr excludes;
ConfigObject::Ptr (*getExclude)(const String& name); ConfigObject::Ptr (*getExclude)(const String& name);
@ -430,14 +457,19 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
ObjectLock excludesLock(excludes); ObjectLock excludesLock(excludes);
ObjectLock excludeChecksumsLock(excludeChecksums); ObjectLock excludeChecksumsLock(excludeChecksums);
excludeChecksums->Reserve(excludes->GetLength());
for (auto exclude : excludes) { for (auto exclude : excludes) {
excludeChecksums->Add(GetObjectIdentifier((*getExclude)(exclude.Get<String>()))); excludeChecksums->Add(GetObjectIdentifier((*getExclude)(exclude.Get<String>())));
} }
statements[m_PrefixConfigCheckSum + typeName + ":overwrite:exclude"].emplace_back(objectKey); auto& excluds (statements.at(m_PrefixConfigObject + typeName + ":overwrite:exclude"));
statements[m_PrefixConfigCheckSum + typeName + ":overwrite:exclude"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(excludes)}}))); auto& excludeChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":overwrite:exclude"));
statements[m_PrefixConfigObject + typeName + ":overwrite:exclude"].emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":overwrite:exclude"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"excludes", excludeChecksums}}))); excludeChksms.emplace_back(objectKey);
excludeChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(excludes)}})));
excluds.emplace_back(objectKey);
excluds.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"excludes", excludeChecksums}})));
return; return;
} }
@ -446,15 +478,21 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
Zone::Ptr zone = static_pointer_cast<Zone>(object); Zone::Ptr zone = static_pointer_cast<Zone>(object);
Array::Ptr parents(new Array); Array::Ptr parents(new Array);
auto parentsRaw (zone->GetAllParentsRaw());
for (auto& parent : zone->GetAllParentsRaw()) { parents->Reserve(parentsRaw.size());
for (auto& parent : parentsRaw) {
parents->Add(GetObjectIdentifier(parent)); parents->Add(GetObjectIdentifier(parent));
} }
statements[m_PrefixConfigCheckSum + typeName + ":parent"].emplace_back(objectKey); auto& parnts (statements.at(m_PrefixConfigObject + typeName + ":parent"));
statements[m_PrefixConfigCheckSum + typeName + ":parent"].emplace_back(JsonEncode(new Dictionary({{"checksum", HashValue(zone->GetAllParents())}}))); auto& parentChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":parent"));
statements[m_PrefixConfigObject + typeName + ":parent"].emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":parent"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"parents", parents}}))); parentChksms.emplace_back(objectKey);
parentChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", HashValue(zone->GetAllParents())}})));
parnts.emplace_back(objectKey);
parnts.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"parents", parents}})));
return; return;
} }
@ -471,14 +509,20 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
if (groups) { if (groups) {
ObjectLock groupsLock(groups); ObjectLock groupsLock(groups);
Array::Ptr groupIds(new Array); Array::Ptr groupIds(new Array);
groupIds->Reserve(groups->GetLength());
for (auto& group : groups) { for (auto& group : groups) {
groupIds->Add(GetObjectIdentifier((*getGroup)(group))); groupIds->Add(GetObjectIdentifier((*getGroup)(group)));
} }
statements[m_PrefixConfigCheckSum + typeName + ":groupmember"].emplace_back(objectKey); auto& members (statements.at(m_PrefixConfigObject + typeName + ":groupmember"));
statements[m_PrefixConfigCheckSum + typeName + ":groupmember"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(groupIds)}}))); auto& memberChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":groupmember"));
statements[m_PrefixConfigObject + typeName + ":groupmember"].emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":groupmember"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"groups", groupIds}}))); memberChksms.emplace_back(objectKey);
memberChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(groupIds)}})));
members.emplace_back(objectKey);
members.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"groups", groupIds}})));
} }
return; return;
@ -499,10 +543,13 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
userIds->Add(GetObjectIdentifier(user)); userIds->Add(GetObjectIdentifier(user));
} }
statements[m_PrefixConfigCheckSum + typeName + ":user"].emplace_back(objectKey); auto& usrs (statements.at(m_PrefixConfigObject + typeName + ":user"));
statements[m_PrefixConfigCheckSum + typeName + ":user"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(userIds)}}))); auto& userChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":user"));
statements[m_PrefixConfigObject + typeName + ":user"].emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":user"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"users", userIds}}))); userChksms.emplace_back(objectKey);
userChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(userIds)}})));
usrs.emplace_back(objectKey);
usrs.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"users", userIds}})));
usergroupIds->Reserve(usergroups.size()); usergroupIds->Reserve(usergroups.size());
@ -510,10 +557,13 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
usergroupIds->Add(GetObjectIdentifier(usergroup)); usergroupIds->Add(GetObjectIdentifier(usergroup));
} }
statements[m_PrefixConfigCheckSum + typeName + ":usergroup"].emplace_back(objectKey); auto& groups (statements.at(m_PrefixConfigObject + typeName + ":usergroup"));
statements[m_PrefixConfigCheckSum + typeName + ":usergroup"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(usergroupIds)}}))); auto& groupChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":usergroup"));
statements[m_PrefixConfigObject + typeName + ":usergroup"].emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":usergroup"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"usergroups", usergroupIds}}))); groupChksms.emplace_back(objectKey);
groupChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(usergroupIds)}})));
groups.emplace_back(objectKey);
groups.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"usergroups", usergroupIds}})));
return; return;
} }
@ -525,36 +575,48 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
if (arguments) { if (arguments) {
ObjectLock argumentsLock(arguments); ObjectLock argumentsLock(arguments);
Array::Ptr argumentIds(new Array); Array::Ptr argumentIds(new Array);
auto& typeArgs (statements.at(m_PrefixConfigObject + typeName + ":argument"));
auto& allArgs (statements.at(m_PrefixConfigObject + "commandargument"));
auto& argChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":argument"));
argumentIds->Reserve(arguments->GetLength());
for (auto& kv : arguments) { for (auto& kv : arguments) {
String id = HashValue(kv.first + HashValue(kv.second)); String id = HashValue(kv.first + HashValue(kv.second));
argumentIds->Add(id); argumentIds->Add(id);
statements[m_PrefixConfigObject + "commandargument"].emplace_back(id); allArgs.emplace_back(id);
statements[m_PrefixConfigObject + "commandargument"].emplace_back(JsonEncode(kv.second)); allArgs.emplace_back(JsonEncode(kv.second));
} }
statements[m_PrefixConfigCheckSum + typeName + ":argument"].emplace_back(objectKey); argChksms.emplace_back(objectKey);
statements[m_PrefixConfigCheckSum + typeName + ":argument"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(argumentIds)}}))); argChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(argumentIds)}})));
statements[m_PrefixConfigObject + typeName + ":argument"].emplace_back(objectKey); typeArgs.emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":argument"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"arguments", argumentIds}}))); typeArgs.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"arguments", argumentIds}})));
} }
Dictionary::Ptr envvars = command->GetArguments(); Dictionary::Ptr envvars = command->GetArguments();
if (envvars) { if (envvars) {
ObjectLock envvarsLock(envvars); ObjectLock envvarsLock(envvars);
Array::Ptr envvarIds(new Array); Array::Ptr envvarIds(new Array);
auto& typeVars (statements.at(m_PrefixConfigObject + typeName + ":envvar"));
auto& allVars (statements.at(m_PrefixConfigObject + "commandenvvar"));
auto& varChksms (statements.at(m_PrefixConfigCheckSum + typeName + ":envvar"));
envvarIds->Reserve(envvars->GetLength());
for (auto& kv : envvars) { for (auto& kv : envvars) {
String id = HashValue(kv.first + HashValue(kv.second)); String id = HashValue(kv.first + HashValue(kv.second));
envvarIds->Add(id); envvarIds->Add(id);
statements[m_PrefixConfigObject + "commandenvvar"].emplace_back(id); allVars.emplace_back(id);
statements[m_PrefixConfigObject + "commandenvvar"].emplace_back(JsonEncode(kv.second)); allVars.emplace_back(JsonEncode(kv.second));
} }
statements[m_PrefixConfigCheckSum + typeName + ":envvar"].emplace_back(objectKey); varChksms.emplace_back(objectKey);
statements[m_PrefixConfigCheckSum + typeName + ":envvar"].emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(envvarIds)}}))); varChksms.emplace_back(JsonEncode(new Dictionary({{"checksum", CalculateCheckSumArray(envvarIds)}})));
statements[m_PrefixConfigObject + typeName + ":envvar"].emplace_back(objectKey); typeVars.emplace_back(objectKey);
statements[m_PrefixConfigObject + typeName + ":envvar"].emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"envvars", envvarIds}}))); typeVars.emplace_back(JsonEncode(new Dictionary({{"env_id", envId}, {"envvars", envvarIds}})));
} }
return; return;