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

arangod/Aql/ShortestPathBlock.cpp

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

arangod/Aql/ShortestPathBlock.h

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