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

condition replace should be almost working

This commit is contained in:
Jan Christoph Uhde 2016-12-05 20:18:31 +01:00
parent 275e36b603
commit d1a3e4482d
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arangod/Aql/OptimizerRules.cpp
View File

@ -3940,8 +3940,8 @@ struct GeoIndexInfo{
{}
EnumerateCollectionNode* collectionNode; // node that will be replaced by (geo) IndexNode
ExecutionNode* executionNode; // start node hat is a sort or filter
AstNode const* expressionNode; // AstNode that contains the sort/filter condition
AstNode const* distanceNode; // AstNode that contains the distance parameters
AstNode* expressionNode; // AstNode that contains the sort/filter condition
AstNode* distanceNode; // AstNode that contains the distance parameters
std::shared_ptr<arangodb::Index> index; //pointer to geoindex
AstNode const* range; // range for within
ExecutionNode::NodeType executionNodeType; // type of execution node sort or filter
@ -4285,6 +4285,18 @@ std::unique_ptr<Condition> buildGeoCondition(ExecutionPlan* plan, GeoIndexInfo&
return condition;
}
//replaces the geoCondition with true.
//void replaceGeoCondition(ExecutionPlan* plan, GeoIndexInfo& info){
void replaceGeoCondition(GeoIndexInfo& info){
//auto ast = plan->getAst();
//ast->createNodeValueBool(true);
if( info.inSubCondition ) {
info.expressionNode->clearMembers();
info.expressionNode->setValueType(VALUE_TYPE_BOOL);
info.expressionNode->setBoolValue(true);
}
}
// applys the optimization for a candidate
bool applyGeoOptimization(bool near, ExecutionPlan* plan, GeoIndexInfo& info){
@ -4341,6 +4353,8 @@ bool applyGeoOptimization(bool near, ExecutionPlan* plan, GeoIndexInfo& info){
plan->registerNode(inode);
condition.release();
//replaceGeoCondition(info);
if(info.executionNodeType == EN::SORT){
plan->unlinkNode(info.executionNode);
}