fix

arangodb · jsteemann · May 18, 2020 · May 13, 2020 · May 13, 2020 · May 13, 2020
commit 2f266253ddd4fb82226f7a88fabe502188cd946b
diff --git a/arangod/Aql/RegisterPlan.cpp b/arangod/Aql/RegisterPlan.cpp
@@ -280,7 +280,7 @@ auto RegisterPlanT<T>::clone() -> std::shared_ptr<RegisterPlanT> {
 }
 
 template <typename T>
-void RegisterPlanT<T>::addSection() {
+void RegisterPlanT<T>::increaseDepth() {
   currentSection++;
   // create a copy of the last value here
   // this is required because back returns a reference and emplace/push_back
@@ -291,9 +291,7 @@ void RegisterPlanT<T>::addSection() {
 
 template <typename T>
 RegisterId RegisterPlanT<T>::addRegister() {
-  nrRegs[currentSection]++;
-
-  return static_cast<RegisterId>(nrRegs[currentSection]);
+  return static_cast<RegisterId>(nrRegs[depth]++);
 }
 
 template <typename T>

diff --git a/arangod/Aql/RegisterPlan.h b/arangod/Aql/RegisterPlan.h
@@ -111,8 +111,7 @@ struct RegisterPlanT final : public std::enable_shared_from_this<RegisterPlanT<T
   std::shared_ptr<RegisterPlanT> clone();
 
   void registerVariable(VariableId v, std::set<RegisterId>& unusedRegisters);
-  /// @brief was previously named `increaseDepth`
-  void addSection();
+  void increaseDepth();
   auto addRegister() -> RegisterId;
   void addSubqueryNode(T* subquery);
 
@@ -126,7 +125,7 @@ struct RegisterPlanT final : public std::enable_shared_from_this<RegisterPlanT<T
                       std::vector<Variable const*> const& varsSetHere) const -> RegIdSetStack;
 
  private:
-  unsigned int currentSection;
+  unsigned int depth;
 };
 
 template <typename T>

diff --git a/tests/Aql/RegisterPlanTest.cpp b/tests/Aql/RegisterPlanTest.cpp
@@ -50,7 +50,7 @@ struct PlanMiniMock {
   auto increaseCounter(ExecutionNode::NodeType type) {
     // This is no longer true for subqueries because reasons, i.e. subqueries
     // are planned multiple times
-    // TODO: refactor subquery planing?
+    // TODO: refactor subquery planning?
     // EXPECT_FALSE(_called) << "Only count every node once per run";
     EXPECT_EQ(_expectedType, type) << "Count the correct type";
   }