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

prepare to fix filter-sort

This commit is contained in:
Jan Christoph Uhde 2016-12-13 10:59:02 +01:00
parent 783a9aff89
commit b8cc674219
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arangod/Aql/OptimizerRules.cpp
View File

@ -4437,17 +4437,40 @@ void arangodb::aql::geoIndexRule(Optimizer* opt,
//LOG_TOPIC(DEBUG, Logger::DEVEL) << "ENTER GEO RULE"; //LOG_TOPIC(DEBUG, Logger::DEVEL) << "ENTER GEO RULE";
std::vector<GeoIndexInfo> infos; std::vector<GeoIndexInfo> filter_info;
checkNodesForGeoOptimization(EN::SORT, plan, infos); std::vector<GeoIndexInfo> sort_info;
checkNodesForGeoOptimization(EN::FILTER, plan, infos); checkNodesForGeoOptimization(EN::FILTER, plan, filter_info);
checkNodesForGeoOptimization(EN::SORT, plan, sort_info);
bool modified = false; bool modified = false;
for(auto& info : infos){ GeoIndexInfo filter_applyed;
for(auto& info : filter_info){
if (applyGeoOptimization(true, plan, info)){ if (applyGeoOptimization(true, plan, info)){
modified = true; modified = true;
filter_applyed = info;
break; // break on first replacement - might be relaxed later break; // break on first replacement - might be relaxed later
} }
} }
if (!modified){
for(auto& info : sort_info){
if (applyGeoOptimization(true, plan, info)){
modified = true;
filter_applyed = info;
break; // break on first replacement - might be relaxed later
}
}
} else {
// find sort that matches filter used and delete sort node if it has only one condition
// check - memory to unlinked collection node should still be valid - see distributeSortToClusterRule
// both nodes must have matching collection and access path to args there may be no additional sort
// between the sort filter and index(collection)
// implement
LOG_TOPIC(DEBUG, Logger::DEVEL) << "GEO RULE - check for sort: " << modified;
}
opt->addPlan(plan, rule, modified); opt->addPlan(plan, rule, modified);
//LOG_TOPIC(DEBUG, Logger::DEVEL) << "EXIT GEO RULE - modified: " << modified; //LOG_TOPIC(DEBUG, Logger::DEVEL) << "EXIT GEO RULE - modified: " << modified;