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-29 17:09:18 +02:00
parent a3d2d0e3f1 bf1f11e651
commit d57ed2749a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Aql/Optimizer.cpp
View File

@ -101,12 +101,7 @@ int Optimizer::createPlans (ExecutionPlan* plan,
_newPlans.clear(); _newPlans.clear();
// int pass = 1;
while (leastDoneLevel < maxRuleLevel) { while (leastDoneLevel < maxRuleLevel) {
/*
std::cout << "Entering pass " << pass << " of query optimization..."
<< std::endl;
*/
// Find variable usage for all old plans now: // Find variable usage for all old plans now:
for (auto p : _plans.list) { for (auto p : _plans.list) {
if (! p->varUsageComputed()) { if (! p->varUsageComputed()) {

13
arangod/Aql/OptimizerRules.cpp
View File

@ -377,7 +377,7 @@ class FilterToEnumCollFinder : public WalkerWorker<ExecutionNode> {
RangesInfo* _ranges; RangesInfo* _ranges;
Optimizer* _opt; Optimizer* _opt;
ExecutionPlan* _plan; ExecutionPlan* _plan;
Variable const* _var; std::unordered_set<VariableId> _varIds;
bool _canThrow; bool _canThrow;
int _level; int _level;
@ -386,9 +386,9 @@ class FilterToEnumCollFinder : public WalkerWorker<ExecutionNode> {
FilterToEnumCollFinder (Optimizer* opt, ExecutionPlan* plan, Variable const* var) FilterToEnumCollFinder (Optimizer* opt, ExecutionPlan* plan, Variable const* var)
: _opt(opt), : _opt(opt),
_plan(plan), _plan(plan),
_var(var),
_canThrow(false) { _canThrow(false) {
_ranges = new RangesInfo(); _ranges = new RangesInfo();
_varIds.insert(var->id);
}; };
~FilterToEnumCollFinder () { ~FilterToEnumCollFinder () {
@ -398,10 +398,15 @@ class FilterToEnumCollFinder : public WalkerWorker<ExecutionNode> {
bool before (ExecutionNode* en) { bool before (ExecutionNode* en) {
_canThrow = (_canThrow || en->canThrow()); // can any node walked over throw? _canThrow = (_canThrow || en->canThrow()); // can any node walked over throw?
if (en->getType() == triagens::aql::ExecutionNode::CALCULATION) { if (en->getType() == triagens::aql::ExecutionNode::FILTER) {
std::vector<Variable const*> inVar = en->getVariablesUsedHere();
TRI_ASSERT(inVar.size() == 1);
_varIds.insert(inVar[0]->id);
}
else 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;