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

ShortestPathBlock does not use EdgeCollectionInfo anymore. Replaced by EdgeCursors

This commit is contained in:
Michael Hackstein 2017-04-26 10:21:18 +02:00
parent 4c58817cc7
commit 9e1eba3bde
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Aql/ShortestPathBlock.cpp
View File

@ -30,7 +30,6 @@
#include "Graph/ShortestPathResult.h" #include "Graph/ShortestPathResult.h"
#include "Transaction/Methods.h" #include "Transaction/Methods.h"
#include "Utils/OperationCursor.h" #include "Utils/OperationCursor.h"
#include "VocBase/EdgeCollectionInfo.h"
#include "VocBase/LogicalCollection.h" #include "VocBase/LogicalCollection.h"
#include "VocBase/ManagedDocumentResult.h" #include "VocBase/ManagedDocumentResult.h"
#include "VocBase/ticks.h" #include "VocBase/ticks.h"
@ -48,7 +47,7 @@ ShortestPathBlock::ShortestPathBlock(ExecutionEngine* engine,
_vertexReg(ExecutionNode::MaxRegisterId), _vertexReg(ExecutionNode::MaxRegisterId),
_edgeVar(nullptr), _edgeVar(nullptr),
_edgeReg(ExecutionNode::MaxRegisterId), _edgeReg(ExecutionNode::MaxRegisterId),
_opts(nullptr), _opts(static_cast<ShortestPathOptions*>(ep->options()),
_posInPath(0), _posInPath(0),
_pathLength(0), _pathLength(0),
_path(nullptr), _path(nullptr),
@ -58,7 +57,7 @@ ShortestPathBlock::ShortestPathBlock(ExecutionEngine* engine,
_useTargetRegister(false), _useTargetRegister(false),
_usedConstant(false), _usedConstant(false),
_engines(nullptr) { _engines(nullptr) {
_opts = static_cast<ShortestPathOptions*>(ep->options()); TRI_ASSERT(_opts != nullptr);
if (!ep->usesStartInVariable()) { if (!ep->usesStartInVariable()) {
_startVertexId = ep->getStartVertex(); _startVertexId = ep->getStartVertex();

4
arangod/Aql/ShortestPathBlock.h
View File

@ -36,10 +36,6 @@ class ShortestPathFinder;
class ShortestPathResult; class ShortestPathResult;
} }
namespace traverser {
class EdgeCollectionInfo;
}
namespace aql { namespace aql {
class ShortestPathNode; class ShortestPathNode;