From 665777c59ac39618b7da864270442aad4632f07b Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Thu, 28 Aug 2014 14:49:33 +0200 Subject: [PATCH] Make dummyRule local in the optimizer. --- arangod/Aql/Optimizer.cpp | 11 +++++++++++ arangod/Aql/OptimizerRules.cpp | 11 ----------- arangod/Aql/OptimizerRules.h | 6 ------ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/arangod/Aql/Optimizer.cpp b/arangod/Aql/Optimizer.cpp index 263a7512b9..fc979999c8 100644 --- a/arangod/Aql/Optimizer.cpp +++ b/arangod/Aql/Optimizer.cpp @@ -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 //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/Aql/OptimizerRules.cpp b/arangod/Aql/OptimizerRules.cpp index 70cec8e917..286e21ffb8 100644 --- a/arangod/Aql/OptimizerRules.cpp +++ b/arangod/Aql/OptimizerRules.cpp @@ -38,17 +38,6 @@ using EN = triagens::aql::ExecutionNode; // --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 /// this rule modifies the plan in place: diff --git a/arangod/Aql/OptimizerRules.h b/arangod/Aql/OptimizerRules.h index d1f6c35034..a46a01eb66 100644 --- a/arangod/Aql/OptimizerRules.h +++ b/arangod/Aql/OptimizerRules.h @@ -40,12 +40,6 @@ namespace triagens { // --SECTION-- rules for the optimizer // ----------------------------------------------------------------------------- -//////////////////////////////////////////////////////////////////////////////// -/// @brief dummyrule -//////////////////////////////////////////////////////////////////////////////// - - int dummyRule (Optimizer*, ExecutionPlan*, int level, Optimizer::PlanList&); - //////////////////////////////////////////////////////////////////////////////// /// @brief remove redundant sorts /// this rule modifies the plan in place: