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

Unvirtualized toJson of Traversal Node. Base Class toJson is required in Cluster. Explainer requires specific toJson

This commit is contained in:
Michael Hackstein 2015-11-26 16:02:38 +01:00
parent 7290507c25
commit cda189d5ca
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Aql/TraversalNode.cpp
View File

@ -311,7 +311,10 @@ void TraversalNode::toJsonHelper (triagens::basics::Json& nodes,
map.second.size()); map.second.size());
for (auto const & x : map.second) { for (auto const & x : map.second) {
triagens::basics::Json exp(zone, triagens::basics::Json::Object); triagens::basics::Json exp(zone, triagens::basics::Json::Object);
x->toJson(exp, zone); auto tmp = dynamic_cast<SimpleTraverserExpression*>(x);
if (tmp != nullptr) {
tmp->toJson(exp, zone);
}
expressionArray(exp); expressionArray(exp);
} }
expressionObject.set(std::to_string(map.first), expressionArray); expressionObject.set(std::to_string(map.first), expressionArray);

2
arangod/VocBase/Traverser.h
View File

@ -125,7 +125,7 @@ namespace triagens {
} }
} }
virtual void toJson (triagens::basics::Json& json, void toJson (triagens::basics::Json& json,
TRI_memory_zone_t* zone) const; TRI_memory_zone_t* zone) const;
bool matchesCheck (TRI_doc_mptr_t& element, bool matchesCheck (TRI_doc_mptr_t& element,