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

activate rule to move calculations up

This commit is contained in:
Jan Steemann 2014-08-21 16:38:49 +02:00
parent 89e74559ae
commit a1fcf9b28e
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangod/Aql/ExecutionPlan.cpp
View File

@ -964,7 +964,7 @@ void ExecutionPlan::unlinkNodes (std::unordered_set<ExecutionNode*>& toRemove) {
////////////////////////////////////////////////////////////////////////////////
void ExecutionPlan::unlinkNode (ExecutionNode* node) {
auto&& parents = node->getParents();
auto parents = node->getParents();
if (parents.empty()) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
"Cannot unlink root node of plan.");
@ -974,7 +974,7 @@ void ExecutionPlan::unlinkNode (ExecutionNode* node) {
"Cannot remove node with more than one parent.");
}
else {
auto&& dep = node->getDependencies();
auto dep = node->getDependencies();
parents[0]->removeDependency(node);
for (auto x : dep) {
parents[0]->addDependency(x);
@ -1000,7 +1000,7 @@ void ExecutionPlan::replaceNode (ExecutionNode* oldNode,
newNode->addDependency(x);
}
auto&& oldNodeParents = oldNode->getParents();
auto oldNodeParents = oldNode->getParents();
for (auto oldNodeParent : oldNodeParents) {
if(! oldNodeParent->replaceDependency(oldNode, newNode)){
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
@ -1020,7 +1020,7 @@ void ExecutionPlan::insertDependency (ExecutionNode* oldNode,
TRI_ASSERT(newNode->getDependencies().size() == 1);
TRI_ASSERT(oldNode != _root);
auto&& oldDeps = oldNode->getDependencies();
auto oldDeps = oldNode->getDependencies();
if (! oldNode->replaceDependency(oldDeps[0], newNode)) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
"Could not replace dependencies of an old node.");

13
arangod/Aql/OptimizerRules.cpp
View File

@ -128,12 +128,6 @@ int triagens::aql::moveCalculationsUpRule (Optimizer* opt,
// (sorting is needed for intersection later)
std::sort(neededVars.begin(), neededVars.end(), &Variable::Comparator);
std::cout << "FOUND A CALCULATIONNODE THAT CANNOT THROW\n";
//std::cout << "JSON: " << nn->expression()->toJson(TRI_UNKNOWN_MEM_ZONE, false).toString() << "\n";
for (auto x : neededVars) {
std::cout << "CALC USES VAR: " << x->name << "\n";
}
std::vector<ExecutionNode*> stack;
for (auto dep : n->getDependencies()) {
stack.push_back(dep);
@ -145,15 +139,11 @@ for (auto x : neededVars) {
bool found = false;
std::cout << "LOOKING AT NODE OF TYPE: " << current->getTypeString() << "\n";
std::cout << "FOUND PREDEC NODE OF TYPE " << current->getTypeString() << "\n";
auto&& varsSet = current->getVariablesSetHere();
for (auto v : varsSet) {
for (auto it = neededVars.begin(); it != neededVars.end(); ++it) {
if ((*it)->id == v->id) {
// shared variable, cannot move up any more
std::cout << "FOUND SHARED VARIABLE: " << v->name << "\n";
found = true;
break;
}
@ -178,9 +168,9 @@ std::cout << "FOUND PREDEC NODE OF TYPE " << current->getTypeString() << "\n";
// first, delete the calculation from the plan
plan->unlinkNode(n);
// and re-insert into before the current node
plan->insertDependency(current, n);
modified = true;
}
}
@ -201,6 +191,7 @@ int triagens::aql::removeUnnecessaryCalculationsRule (Optimizer* opt,
ExecutionPlan* plan,
Optimizer::PlanList& out,
bool& keep) {
std::cout << "REMOVE UNNECESSARY CALCULATIONS\n";
keep = true;
std::vector<ExecutionNode*> nodes
= plan->findNodesOfType(triagens::aql::ExecutionNode::CALCULATION, true);