From 232cc163c2bc60104bd3db23b301b012ea043ccf Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Tue, 19 Aug 2014 16:10:57 +0200
Subject: [PATCH] renamed optimizer rule

---
 arangod/Aql/Optimizer.cpp      | 3 +--
 arangod/Aql/OptimizerRules.cpp | 8 ++++----
 arangod/Aql/OptimizerRules.h   | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arangod/Aql/Optimizer.cpp b/arangod/Aql/Optimizer.cpp
index c65c8b5732..78512f1467 100644
--- a/arangod/Aql/Optimizer.cpp
+++ b/arangod/Aql/Optimizer.cpp
@@ -50,8 +50,7 @@ Optimizer::Optimizer () {
   // TODO: validate if this is really an optimization
   // registerRule(moveCalculationsUpRule, 1000);
 
-  // deactivated because a test crashes
-  registerRule(removeUnnecessaryCalc, 999);
+  registerRule(removeUnnecessaryCalculationsRule, 999);
 
   // Now sort them by pass:
   std::stable_sort(_rules.begin(), _rules.end());
diff --git a/arangod/Aql/OptimizerRules.cpp b/arangod/Aql/OptimizerRules.cpp
index f391780726..48fa5ac641 100644
--- a/arangod/Aql/OptimizerRules.cpp
+++ b/arangod/Aql/OptimizerRules.cpp
@@ -224,10 +224,10 @@ int triagens::aql::moveCalculationsUpRule (Optimizer* opt,
 /// @brief remove CalculationNode(s) that are never needed
 ////////////////////////////////////////////////////////////////////////////////
 
-int triagens::aql::removeUnnecessaryCalc (Optimizer* opt, 
-                                          ExecutionPlan* plan, 
-                                          Optimizer::PlanList& out, 
-                                          bool& keep) {
+int triagens::aql::removeUnnecessaryCalculationsRule (Optimizer* opt, 
+                                                      ExecutionPlan* plan, 
+                                                      Optimizer::PlanList& out, 
+                                                      bool& keep) {
   std::vector<ExecutionNode*> nodes
     = plan->findNodesOfType(triagens::aql::ExecutionNode::CALCULATION);
   std::unordered_set<ExecutionNode*> toRemove;
diff --git a/arangod/Aql/OptimizerRules.h b/arangod/Aql/OptimizerRules.h
index 0c7ac483a7..2b7c947099 100644
--- a/arangod/Aql/OptimizerRules.h
+++ b/arangod/Aql/OptimizerRules.h
@@ -55,7 +55,7 @@ namespace triagens {
 /// @brief remove a CalculationNode that is never needed
 ////////////////////////////////////////////////////////////////////////////////
 
-    int removeUnnecessaryCalc (Optimizer*, ExecutionPlan*, Optimizer::PlanList&, bool&);
+    int removeUnnecessaryCalculationsRule (Optimizer*, ExecutionPlan*, Optimizer::PlanList&, bool&);
 
   }  // namespace aql
 }  // namespace triagens