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

Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2

This commit is contained in:
James 2014-08-28 15:02:27 +02:00
parent 9644fc87c7 665777c59a
commit 9f6f15f85f
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arangod/Aql/Optimizer.cpp
View File

@ -46,6 +46,17 @@ Optimizer::Optimizer () {
} }
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief dummyrule
////////////////////////////////////////////////////////////////////////////////
static int dummyRule (Optimizer*,
ExecutionPlan*,
int level,
Optimizer::PlanList&) {
return TRI_ERROR_NO_ERROR;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// @brief the actual optimization // @brief the actual optimization
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

11
arangod/Aql/OptimizerRules.cpp
View File

@ -38,17 +38,6 @@ using EN = triagens::aql::ExecutionNode;
// --SECTION-- rules for the optimizer // --SECTION-- rules for the optimizer
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @brief dummyrule
////////////////////////////////////////////////////////////////////////////////
int triagens::aql::dummyRule (Optimizer*,
ExecutionPlan*,
int level,
Optimizer::PlanList&) {
return TRI_ERROR_NO_ERROR;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief remove redundant sorts /// @brief remove redundant sorts
/// this rule modifies the plan in place: /// this rule modifies the plan in place:

6
arangod/Aql/OptimizerRules.h
View File

@ -40,12 +40,6 @@ namespace triagens {
// --SECTION-- rules for the optimizer // --SECTION-- rules for the optimizer
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @brief dummyrule
////////////////////////////////////////////////////////////////////////////////
int dummyRule (Optimizer*, ExecutionPlan*, int level, Optimizer::PlanList&);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief remove redundant sorts /// @brief remove redundant sorts
/// this rule modifies the plan in place: /// this rule modifies the plan in place: