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 2016-09-15 10:26:29 +02:00
parent 3435e973ec a1089521c3
commit abb16eeb0f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Aql/Graphs.cpp
View File

@ -77,8 +77,7 @@ void Graph::toVelocyPack(VPackBuilder& builder, bool verbose) const {
} }
} }
Graph::Graph(VPackSlice const& info) : _vertexColls(), _edgeColls() { Graph::Graph(VPackSlice const& slice) : _vertexColls(), _edgeColls() {
VPackSlice const slice = info.resolveExternal();
if (slice.hasKey(_attrEdgeDefs)) { if (slice.hasKey(_attrEdgeDefs)) {
auto edgeDefs = slice.get(_attrEdgeDefs); auto edgeDefs = slice.get(_attrEdgeDefs);

6
arangod/VocBase/Graphs.cpp
View File

@ -71,7 +71,11 @@ arangodb::aql::Graph* arangodb::lookupGraphByName(TRI_vocbase_t* vocbase,
THROW_ARANGO_EXCEPTION_FORMAT(res, "while looking up graph '%s'", THROW_ARANGO_EXCEPTION_FORMAT(res, "while looking up graph '%s'",
name.c_str()); name.c_str());
} }
VPackSlice info = result.slice();
if (result.isExternal()) {
info = info.resolveExternal();
}
return new arangodb::aql::Graph(result.slice()); return new arangodb::aql::Graph(info);
} }
#endif #endif