fix(p3): remove init check plan (#546)

Author: christopherlim98

src/execution/executor_factory.cpp

@@ -35,7 +35,6 @@
 #include "execution/executors/update_executor.h"
 #include "execution/executors/values_executor.h"
 #include "execution/plans/filter_plan.h"
-#include "execution/plans/init_check_plan.h"
 #include "execution/plans/mock_scan_plan.h"
 #include "execution/plans/projection_plan.h"
 #include "execution/plans/sort_plan.h"
@@ -100,11 +99,10 @@ auto ExecutorFactory::CreateExecutor(ExecutorContext *exec_ctx, const AbstractPl
       auto left = ExecutorFactory::CreateExecutor(exec_ctx, nested_loop_join_plan->GetLeftPlan());
       auto right = ExecutorFactory::CreateExecutor(exec_ctx, nested_loop_join_plan->GetRightPlan());
       if (check_options_set.find(CheckOption::ENABLE_NLJ_CHECK) != check_options_set.end()) {
-        auto left_init_check_plan = dynamic_cast<const InitCheckPlanNode *>(nested_loop_join_plan->GetLeftPlan().get());
-        auto right_init_check_plan =
-            dynamic_cast<const InitCheckPlanNode *>(nested_loop_join_plan->GetRightPlan().get());
-        auto left_check = std::make_unique<InitCheckExecutor>(exec_ctx, left_init_check_plan, std::move(left));
-        auto right_check = std::make_unique<InitCheckExecutor>(exec_ctx, right_init_check_plan, std::move(right));
+        auto left_check =
+            std::make_unique<InitCheckExecutor>(exec_ctx, nested_loop_join_plan->GetLeftPlan(), std::move(left));
+        auto right_check =
+            std::make_unique<InitCheckExecutor>(exec_ctx, nested_loop_join_plan->GetRightPlan(), std::move(right));
         exec_ctx->AddCheckExecutor(left_check.get(), right_check.get());
         return std::make_unique<NestedLoopJoinExecutor>(exec_ctx, nested_loop_join_plan, std::move(left_check),
                                                         std::move(right_check));

src/execution/init_check_executor.cpp

@@ -11,12 +11,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "execution/executors/init_check_executor.h"
+#include "execution/plans/abstract_plan.h"
 
 namespace bustub {
 
-InitCheckExecutor::InitCheckExecutor(ExecutorContext *exec_ctx, const InitCheckPlanNode *plan,
+InitCheckExecutor::InitCheckExecutor(ExecutorContext *exec_ctx, const AbstractPlanNodeRef &plan,
                                      std::unique_ptr<AbstractExecutor> &&child_executor)
-    : AbstractExecutor{exec_ctx}, child_executor_{std::move(child_executor)} {}
+    : AbstractExecutor{exec_ctx}, plan_{plan}, child_executor_{std::move(child_executor)} {}
 
 void InitCheckExecutor::Init() {
   if (!child_executor_) {

src/include/execution/executors/init_check_executor.h

@@ -17,7 +17,7 @@
 
 #include "execution/executor_context.h"
 #include "execution/executors/abstract_executor.h"
-#include "execution/plans/init_check_plan.h"
+#include "execution/plans/abstract_plan.h"
 
 namespace bustub {
 
@@ -32,7 +32,7 @@ class InitCheckExecutor : public AbstractExecutor {
    * @param plan The init check plan to be executed
    * @param child_executor The child executor from which init calls are counted
    */
-  InitCheckExecutor(ExecutorContext *exec_ctx, const InitCheckPlanNode *plan,
+  InitCheckExecutor(ExecutorContext *exec_ctx, const AbstractPlanNodeRef &plan,
                     std::unique_ptr<AbstractExecutor> &&child_executor);
 
   /** Initialize the InitCheck */
@@ -63,7 +63,7 @@ class InitCheckExecutor : public AbstractExecutor {
   constexpr static const bool EXECUTOR_EXHAUSTED{false};
 
   /** The init check plan node to be executed */
-  const InitCheckPlanNode *plan_;
+  const AbstractPlanNodeRef &plan_;
 
   /** The child executor from which tuples are obtained */
   std::unique_ptr<AbstractExecutor> child_executor_;