tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve performance for object queries 

fixes #10360
This commit is contained in:
Gunnar Beutner 2015-10-14 16:08:23 +02:00
parent 48d80e29a0
commit f841daf680
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/remote/objectqueryhandler.cpp
View File

@ -61,14 +61,17 @@ bool ObjectQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& re
attrs.insert(uattr); attrs.insert(uattr);
String::SizeType dpos = uattr.FindFirstOf("."); String::SizeType dpos = uattr.FindFirstOf(".");
if (dpos != String::NPos) { if (dpos == String::NPos) {
String userJoinAttr = uattr.SubStr(0, dpos); HttpUtility::SendJsonError(response, 400, "Attribute name must contain '.'.");
return true;
if (userJoinAttr == type->GetName().ToLower())
userJoinAttr = "";
userJoinAttrs.insert(userJoinAttr);
} }
String userJoinAttr = uattr.SubStr(0, dpos);
if (userJoinAttr == type->GetName().ToLower())
userJoinAttr = "";
userJoinAttrs.insert(userJoinAttr);
} }
} }
@ -98,6 +101,7 @@ bool ObjectQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& re
std::vector<Value> objs = FilterUtility::GetFilterTargets(qd, params, user); std::vector<Value> objs = FilterUtility::GetFilterTargets(qd, params, user);
Array::Ptr results = new Array(); Array::Ptr results = new Array();
results->Reserve(objs.size());
BOOST_FOREACH(const ConfigObject::Ptr& obj, objs) { BOOST_FOREACH(const ConfigObject::Ptr& obj, objs) {
Dictionary::Ptr result1 = new Dictionary(); Dictionary::Ptr result1 = new Dictionary();
@ -128,11 +132,31 @@ bool ObjectQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& re
Type::Ptr joinedType = joinedObj->GetReflectionType(); Type::Ptr joinedType = joinedObj->GetReflectionType();
for (int fid = 0; fid < joinedType->GetFieldCount(); fid++) { std::vector<int> fids;
if (attrs.empty()) {
for (int fid = 0; fid < joinedType->GetFieldCount(); fid++) {
fids.push_back(fid);
}
} else {
BOOST_FOREACH(const String& aname, attrs) {
String::SizeType dpos = aname.FindFirstOf(".");
ASSERT(dpos != String::NPos);
String userJoinAttr = aname.SubStr(0, dpos);
if (userJoinAttr != prefix)
continue;
String userAttr = aname.SubStr(dpos + 1);
int fid = joinedType->GetFieldId(userAttr);
fids.push_back(fid);
}
}
BOOST_FOREACH(int& fid, fids) {
Field field = joinedType->GetFieldInfo(fid); Field field = joinedType->GetFieldInfo(fid);
String aname = prefix + "." + field.Name; String aname = prefix + "." + field.Name;
if (!attrs.empty() && attrs.find(aname) == attrs.end())
continue;
Value val = joinedObj->GetField(fid); Value val = joinedObj->GetField(fid);