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

add iterative preorder walk for and conditions

This commit is contained in:
Jan Christoph Uhde 2016-12-05 15:19:06 +01:00
parent 5dcf61c9ba
commit b0b660eb85
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
arangod/Aql/OptimizerRules.cpp
View File

@ -4139,6 +4139,32 @@ GeoIndexInfo isDistanceFunction(AstNode const* node){
return rv; return rv;
} }
GeoIndexInfo iterativePreorderWithCondition(AstNode const* root, GeoIndexInfo(*condition)(AstNode const*)){
// returns on first hit
if (!root){
return GeoIndexInfo{};
}
std::vector<AstNode const*> nodestack;
nodestack.push_back(root);
while(nodestack.size()){
AstNode const* current = nodestack.back();
nodestack.pop_back();
GeoIndexInfo rv = condition(current);
if (rv) {
return rv;
}
if (current->type == NODE_TYPE_OPERATOR_BINARY_AND || current->type == NODE_TYPE_OPERATOR_NARY_AND ){
for (std::size_t i = 0; i < current->numMembers(); ++i){
nodestack.push_back(current->getMember(i));
}
}
}
return GeoIndexInfo{};
}
GeoIndexInfo isGeoFilterExpression(AstNode const* node){ GeoIndexInfo isGeoFilterExpression(AstNode const* node){
// binary compare must be on top // binary compare must be on top
bool dist_first = true; bool dist_first = true;
@ -4268,30 +4294,12 @@ GeoIndexInfo identifyGeoOptimizationCandidate(ExecutionNode::NodeType type, Exec
//FIXME -- technical debt -- code duplication / not all cases covered //FIXME -- technical debt -- code duplication / not all cases covered
switch(type){ switch(type){
case EN::SORT: { case EN::SORT: {
//iterate && and find frist candidate - this gets way more complex if we want to check more
auto ntype = node->type;
if ( ntype == NODE_TYPE_OPERATOR_BINARY_AND || ntype == NODE_TYPE_OPERATOR_NARY_AND){
for(std::size_t i = 0; i < node->numMembers(); ++i){
rv = isDistanceFunction(node->getMember(i));
if(rv) break;
}
} else {
rv = isDistanceFunction(node); rv = isDistanceFunction(node);
} }
}
break; break;
case EN::FILTER: { case EN::FILTER: {
//iterate && and find frist candidate - this gets way more complex if we want to check more rv = iterativePreorderWithCondition(node,isGeoFilterExpression);
auto ntype = node->type;
if ( ntype == NODE_TYPE_OPERATOR_BINARY_AND || ntype == NODE_TYPE_OPERATOR_NARY_AND){
for(std::size_t i = 0; i < node->numMembers(); ++i){
rv = isGeoFilterExpression(node->getMember(i));
if(rv) break;
}
} else {
rv = isGeoFilterExpression(node);
}
} }
break; break;