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

Make IndexRange rule look for multiple variables in FILTERs. 

Still TODO: Pickup further variables when seeing FILTERs.
This commit is contained in:
Max Neunhoeffer 2014-08-29 15:49:37 +02:00
parent e1ee728a75
commit 65e765478d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/Aql/OptimizerRules.cpp
View File

@ -378,7 +378,7 @@ int triagens::aql::removeUnnecessaryCalculationsRule (Optimizer* opt,
class FilterToEnumCollFinder : public WalkerWorker<ExecutionNode> { class FilterToEnumCollFinder : public WalkerWorker<ExecutionNode> {
RangesInfo* _ranges; RangesInfo* _ranges;
ExecutionPlan* _plan; ExecutionPlan* _plan;
Variable const* _var; std::unordered_set<VariableId> _varIds;
Optimizer::PlanList* _out; Optimizer::PlanList* _out;
bool _canThrow; bool _canThrow;
int _level; int _level;
@ -387,11 +387,11 @@ class FilterToEnumCollFinder : public WalkerWorker<ExecutionNode> {
FilterToEnumCollFinder (ExecutionPlan* plan, Variable const * var, Optimizer::PlanList* out, int level) FilterToEnumCollFinder (ExecutionPlan* plan, Variable const * var, Optimizer::PlanList* out, int level)
: _plan(plan), : _plan(plan),
_var(var),
_out(out), _out(out),
_canThrow(false), _canThrow(false),
_level(level) { _level(level) {
_ranges = new RangesInfo(); _ranges = new RangesInfo();
_varIds.insert(var->id);
}; };
~FilterToEnumCollFinder () { ~FilterToEnumCollFinder () {
@ -404,7 +404,7 @@ class FilterToEnumCollFinder : public WalkerWorker<ExecutionNode> {
if (en->getType() == triagens::aql::ExecutionNode::CALCULATION) { if (en->getType() == triagens::aql::ExecutionNode::CALCULATION) {
auto outvar = en->getVariablesSetHere(); auto outvar = en->getVariablesSetHere();
TRI_ASSERT(outvar.size() == 1); TRI_ASSERT(outvar.size() == 1);
if (outvar[0]->id == _var->id) { if (_varIds.find(outvar[0]->id) != _varIds.end()) {
auto node = static_cast<CalculationNode*>(en); auto node = static_cast<CalculationNode*>(en);
std::string attr; std::string attr;
std::string enumCollVar; std::string enumCollVar;