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 2017-04-26 09:52:37 +02:00
parent 3afd200599 f876eef088
commit 6ac6c3c859
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/ShortestPathBlock.cpp
View File

@ -257,9 +257,7 @@ bool ShortestPathBlock::nextPath(AqlItemBlock const* items) {
VPackSlice start = _opts->getStart(); VPackSlice start = _opts->getStart();
VPackSlice end = _opts->getEnd(); VPackSlice end = _opts->getEnd();
TRI_ASSERT(_finder != nullptr); TRI_ASSERT(_finder != nullptr);
// We do not need this data anymore. Result has been processed.
// Save some memory.
_coordinatorCache.clear();
bool hasPath = bool hasPath =
_finder->shortestPath(start, end, *_path, [this]() { throwIfKilled(); }); _finder->shortestPath(start, end, *_path, [this]() { throwIfKilled(); });

3
arangod/Aql/ShortestPathBlock.h
View File

@ -146,9 +146,6 @@ class ShortestPathBlock : public ExecutionBlock {
/// We use it to check if we are done with enumerating. /// We use it to check if we are done with enumerating.
bool _usedConstant; bool _usedConstant;
/// @brief Cache for edges send over the network
std::vector<std::shared_ptr<VPackBuffer<uint8_t>>> _coordinatorCache;
/// @brief Traverser Engines /// @brief Traverser Engines
std::unordered_map<ServerID, traverser::TraverserEngineID> const* _engines; std::unordered_map<ServerID, traverser::TraverserEngineID> const* _engines;