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

assign register in constructor

This commit is contained in:
Jan Steemann 2014-10-02 17:35:43 +02:00
parent eae877b1be
commit 31005892d2
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arangod/Aql/ExecutionBlock.cpp
View File

@ -1486,19 +1486,6 @@ int EnumerateListBlock::initialize () {
return res; return res;
} }
auto en = reinterpret_cast<EnumerateListNode const*>(_exeNode);
// get the inVariable register id . . .
// planRegisters() has been run, so getPlanNode()->_varOverview is set up
auto it = getPlanNode()->getVarOverview()->varInfo.find(en->_inVariable->id);
if (it == getPlanNode()->getVarOverview()->varInfo.end()){
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "variable not found");
}
_inVarRegId = (*it).second.registerId;
TRI_ASSERT(_inVarRegId < ExecutionNode::MaxRegisterId);
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }

11
arangod/Aql/ExecutionBlock.h
View File

@ -645,9 +645,16 @@ namespace triagens {
public: public:
EnumerateListBlock (ExecutionEngine* engine, EnumerateListBlock (ExecutionEngine* engine,
EnumerateListNode const* ep) EnumerateListNode const* en)
: ExecutionBlock(engine, ep) { : ExecutionBlock(engine, en),
_inVarRegId(ExecutionNode::MaxRegisterId) {
auto it = en->getVarOverview()->varInfo.find(en->_inVariable->id);
if (it == en->getVarOverview()->varInfo.end()){
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "variable not found");
}
_inVarRegId = (*it).second.registerId;
TRI_ASSERT(_inVarRegId < ExecutionNode::MaxRegisterId);
} }
~EnumerateListBlock () { ~EnumerateListBlock () {