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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2015-12-09 11:22:00 +01:00
parent 9f55780a59 aca6c2421b
commit 89b08bc39e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Books/Users/Aql/GraphTraversals.mdpp
View File

@ -273,3 +273,5 @@ And finally clean it up again:
If this traversal is not powerful enough for your needs, so you cannot describe your conditions as AQL filter statements you might want to look at [manually crafted traverser](../Traversals/README.md). If this traversal is not powerful enough for your needs, so you cannot describe your conditions as AQL filter statements you might want to look at [manually crafted traverser](../Traversals/README.md).
[See here for more traversal examples](../AqlExamples/CombiningGraphTraversals.md).

3
arangod/Cluster/ClusterTraverser.h
View File

@ -66,6 +66,9 @@ namespace triagens {
for (auto& it : _vertices) { for (auto& it : _vertices) {
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, it.second); TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, it.second);
} }
for (auto& it : _edges) {
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, it.second);
}
} }
void setStartVertex (VertexId const& v) override; void setStartVertex (VertexId const& v) override;