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

Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2

This commit is contained in:
Jan Steemann 2014-08-18 16:31:20 +02:00
parent 0666708206 40f743ccbc
commit 2d62ca94cc
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Aql/ExecutionPlan.cpp
View File

@ -829,6 +829,7 @@ struct VarUsageFinder : public WalkerWorker<ExecutionNode> {
std::unordered_set<Variable const*> _usedLater; std::unordered_set<Variable const*> _usedLater;
std::unordered_set<Variable const*> _valid; std::unordered_set<Variable const*> _valid;
std::unordered_map<VariableId, ExecutionNode*> _varSetBy;
VarUsageFinder () { VarUsageFinder () {
}; };
@ -851,6 +852,7 @@ struct VarUsageFinder : public WalkerWorker<ExecutionNode> {
std::vector<Variable const*> setHere = en->getVariablesSetHere(); std::vector<Variable const*> setHere = en->getVariablesSetHere();
for (auto v : setHere) { for (auto v : setHere) {
_valid.insert(v); _valid.insert(v);
_varSetBy.insert(std::make_pair(v->id, en));
} }
en->setVarsValid(_valid); en->setVarsValid(_valid);
en->setVarUsageValid(); en->setVarUsageValid();
@ -867,6 +869,7 @@ struct VarUsageFinder : public WalkerWorker<ExecutionNode> {
void ExecutionPlan::findVarUsage () { void ExecutionPlan::findVarUsage () {
VarUsageFinder finder; VarUsageFinder finder;
root()->walk(&finder); root()->walk(&finder);
_varSetBy = finder._varSetBy;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

18
arangod/Aql/ExecutionPlan.h
View File

@ -98,6 +98,18 @@ namespace triagens {
return _root->getCost(); return _root->getCost();
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief get the node where variable with id <id> is introduced . . .
////////////////////////////////////////////////////////////////////////////////
ExecutionNode* getVarSetBy (VariableId id) const {
auto it = _varSetBy.find(id);
if( it == _varSetBy.end()){
return nullptr;
}
return (*it).second;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief find nodes of a certain type /// @brief find nodes of a certain type
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -263,6 +275,12 @@ namespace triagens {
ExecutionNode* _root; ExecutionNode* _root;
////////////////////////////////////////////////////////////////////////////////
/// @brief get the node where a variable is introducted.
////////////////////////////////////////////////////////////////////////////////
std::unordered_map<VariableId, ExecutionNode*> _varSetBy;
}; };
} }