Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

RestQueryHandler uses the first VelocyPack parsed user input

This commit is contained in:
Michael Hackstein 2015-11-09 15:13:47 +01:00
parent 2ff01110f7
commit 34e4d461d0
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arangod/RestHandler/RestQueryCacheHandler.cpp
View File

@ -224,13 +224,21 @@ bool RestQueryCacheHandler::replaceProperties () {
"expecting PUT /_api/query-cache/properties");
return true;
}
bool validBody = true;
VPackBuilder parsedBody = parseVelocyPackBody(validBody);
std::unique_ptr<TRI_json_t> body(parseJsonBody());
if (body == nullptr) {
if (! validBody) {
// error message generated in parseJsonBody
return true;
}
VPackSlice body = parsedBody.slice();
if (! body.isObject()) {
generateError(HttpResponse::BAD,
TRI_ERROR_HTTP_BAD_PARAMETER,
"expecting a JSON-Object body");
return true;
}
auto queryCache = triagens::aql::QueryCache::instance();
@ -238,16 +246,17 @@ bool RestQueryCacheHandler::replaceProperties () {
std::pair<std::string, size_t> cacheProperties;
queryCache->properties(cacheProperties);
auto attribute = static_cast<TRI_json_t const*>(TRI_LookupObjectJson(body.get(), "mode"));
if (TRI_IsStringJson(attribute)) {
cacheProperties.first = std::string(attribute->_value._string.data, attribute->_value._string.length - 1);
VPackSlice attribute = body.get("mode");
if (attribute.isString()) {
VPackValueLength len;
char const* st = attribute.getString(len);
cacheProperties.first = std::string(st, len);
}
attribute = static_cast<TRI_json_t const*>(TRI_LookupObjectJson(body.get(), "maxResults"));
if (TRI_IsNumberJson(attribute)) {
cacheProperties.second = static_cast<size_t>(attribute->_value._number);
attribute = body.get("maxResults");
if (attribute.isNumber()) {
cacheProperties.second = static_cast<size_t>(attribute.getUInt());
}
queryCache->setProperties(cacheProperties);