Fixed bug in optimizer test

Author: GustavoAngulo

src/include/optimizer/memo.h

@@ -54,7 +54,7 @@ class Memo {
   GroupExpression* InsertExpression(std::shared_ptr<GroupExpression> gexpr,
                                     GroupID target_group, bool enforced);
 
-  const std::vector<std::unique_ptr<Group>>& Groups() const;
+  std::vector<std::unique_ptr<Group>>& Groups();
 
   Group* GetGroupByID(GroupID id);
 

src/include/optimizer/optimizer.h

@@ -88,6 +88,11 @@ class Optimizer : public AbstractOptimizer {
   concurrency::TransactionContext *txn) {
     return InsertQueryTree(tree, txn);
   }
+  /* For test purposes only */
+  void TestExecuteTaskStack(OptimizerTaskStack &task_stack, int root_group_id,
+                        std::shared_ptr<OptimizeContext> root_context) {
+    return ExecuteTaskStack(task_stack, root_group_id, root_context);
+  }
 
  private:
   /* HandleDDLStatement - Check and handle DDL statment (currently only support

src/optimizer/memo.cpp

@@ -63,7 +63,7 @@ GroupExpression *Memo::InsertExpression(std::shared_ptr<GroupExpression> gexpr,
   }
 }
 
-const std::vector<std::unique_ptr<Group>> &Memo::Groups() const {
+std::vector<std::unique_ptr<Group>> &Memo::Groups() {
   return groups_;
 }
 

test/optimizer/optimizer_test.cpp

@@ -471,25 +471,25 @@ TEST_F(OptimizerTests, ExecuteTaskStackTest) {
   const int root_group_id = 0;
   const auto root_group =
       new Group(root_group_id, std::unordered_set<std::string>());
-  optimizer.metadata_.memo.groups_.emplace_back(root_group);
+  optimizer.GetMetadata().memo.Groups().emplace_back(root_group);
 
   auto required_prop = std::make_shared<PropertySet>(PropertySet());
   auto root_context =
-      std::make_shared<OptimizeContext>(&(optimizer.metadata_), required_prop);
+      std::make_shared<OptimizeContext>(&(optimizer.GetMetadata()), required_prop);
   auto task_stack =
       std::unique_ptr<OptimizerTaskStack>(new OptimizerTaskStack());
-  auto &timer = optimizer.metadata_.timer;
+  auto &timer = optimizer.GetMetadata().timer;
 
   // Insert tasks into task stack
   for (unsigned int i = 0; i < num_tasks; i++) {
     auto task = new optimizer::test::MockTask();
     EXPECT_CALL(*task, execute()).Times(1);
     task_stack->Push(task);
   }
-  optimizer.metadata_.SetTaskPool(task_stack.get());
+  optimizer.GetMetadata().SetTaskPool(task_stack.get());
 
   const auto start_time = timer.GetDuration();
-  optimizer.ExecuteTaskStack(*task_stack, root_group_id, root_context);
+  optimizer.TestExecuteTaskStack(*task_stack, root_group_id, root_context);
   ASSERT_EQ(timer.GetInvocations(), num_tasks);
   ASSERT_GT(timer.GetDuration(), start_time);
 }