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

Fix serialisation of IndexRangeNode.

This commit is contained in:
Max Neunhoeffer 2014-09-11 18:45:47 +02:00
parent ffbfc9e9e3
commit 088e0ed2f9
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arangod/Aql/ExecutionNode.cpp
View File

@ -565,12 +565,14 @@ void IndexRangeNode::toJsonHelper (triagens::basics::Json& nodes,
} }
// put together the range info . . . // put together the range info . . .
Json ranges(Json::List); Json ranges(Json::List, _ranges.size());
for (auto x : _ranges) { for (auto x : _ranges) {
Json range(Json::List, x.size());
for(auto y : x) { for(auto y : x) {
ranges(y.toJson()); range.add(y.toJson());
} }
ranges.add(range);
} }
// Now put info about vocbase and cid in there // Now put info about vocbase and cid in there
@ -603,12 +605,15 @@ IndexRangeNode::IndexRangeNode (Ast* ast, basics::Json const& json)
_vocbase(ast->query()->vocbase()), _vocbase(ast->query()->vocbase()),
_collection(ast->query()->collections()->add(JsonHelper::checkAndGetStringValue(json.json(), _collection(ast->query()->collections()->add(JsonHelper::checkAndGetStringValue(json.json(),
"collection"), TRI_TRANSACTION_READ)), "collection"), TRI_TRANSACTION_READ)),
_outVariable(varFromJson(ast, json, "outVariable")), _ranges() { _outVariable(varFromJson(ast, json, "outVariable")),
_ranges() {
Json ranges(TRI_UNKNOWN_MEM_ZONE, JsonHelper::checkAndGetListValue(json.json(), "ranges")); Json rangesJson(TRI_UNKNOWN_MEM_ZONE, JsonHelper::checkAndGetListValue(json.json(), "ranges"));
for(size_t i = 0; i < ranges.size(); i++){ //loop over the ranges . . . for(size_t i = 0; i < rangesJson.size(); i++){ //loop over the ranges . . .
for(size_t j = 0; j < ranges.at(i).size(); j++){ _ranges.emplace_back();
_ranges.at(i).push_back(RangeInfo(ranges.at(i).at(j))); Json rangeJson(rangesJson.at(i));
for(size_t j = 0; j < rangeJson.size(); j++){
_ranges.at(i).emplace_back(rangeJson.at(j));
} }
} }