add drop column executor

Author: sxzh93

src/executor/alter_executor.cpp

@@ -21,8 +21,8 @@ namespace executor {
 
 // Constructor for alter table executor
 AlterExecutor::AlterExecutor(const planner::AbstractPlan *node,
-                             ExecutorContext *executor_context)
-    : AbstractExecutor(node, executor_context) {}
+                             ExecutorContext *executor_context, bool isAlter)
+    : AbstractExecutor(node, executor_context), isAlter_(isAlter) {}
 
 // Initialize executor
 // Nothing to initialize for now
@@ -36,17 +36,22 @@ bool AlterExecutor::DInit() {
 bool AlterExecutor::DExecute() {
   LOG_TRACE("Executing Drop...");
   bool result = false;
-  const planner::RenamePlan &node = GetPlanNode<planner::RenamePlan>();
-  auto current_txn = executor_context_->GetTransaction();
-  PlanNodeType plan_node_type = node.GetPlanNodeType();
-  if (plan_node_type == PlanNodeType::RENAME) {
+  if (!isAlter_) {
+    const planner::RenamePlan &node = GetPlanNode<planner::RenamePlan>();
+    auto current_txn = executor_context_->GetTransaction();
     result = RenameColumn(node, current_txn);
-  } else if (plan_node_type == PlanNodeType::ALTER) {
-    LOG_TRACE("Will perform alter table operations");
   } else {
-    throw NotImplementedException(
-        StringUtil::Format("Plan node type not supported, %s",
-                           PlanNodeTypeToString(plan_node_type).c_str()));
+    const planner::AlterPlan &node = GetPlanNode<planner::AlterPlan>();
+    auto current_txn = executor_context_->GetTransaction();
+    AlterType type = node.GetAlterTableType();
+    switch (type) {
+      case AlterType::DROP:
+        result = DropColumn(node, current_txn);
+        break;
+      default:
+        throw NotImplementedException(StringUtil::Format(
+            "Alter Type not supported, %s", AlterTypeToString(type).c_str()));
+    }
   }
 
   return result;
@@ -69,7 +74,27 @@ bool AlterExecutor::RenameColumn(
   if (txn->GetResult() == ResultType::SUCCESS) {
     LOG_TRACE("Rename column succeeded!");
 
-    // Add on succeed logic if necessary
+    // TODO Add on succeed logic if necessary
+  } else {
+    LOG_TRACE("Result is: %s", ResultTypeToString(txn->GetResult()).c_str());
+  }
+  return false;
+}
+
+bool AlterExecutor::DropColumn(const peloton::planner::AlterPlan &node,
+                               peloton::concurrency::TransactionContext *txn) {
+  auto database_name = node.GetDatabaseName();
+  auto table_name = node.GetTableName();
+  auto drop_columns = node.GetDroppedColumns();
+
+  ResultType result = catalog::Catalog::GetInstance()->DropColumn(
+      database_name, table_name, drop_columns, txn);
+  txn->SetResult(result);
+
+  if (txn->GetResult() == ResultType::SUCCESS) {
+    LOG_TRACE("Drop column succeed!");
+
+    // TODO Add on succeed logic if necessary
   } else {
     LOG_TRACE("Result is: %s", ResultTypeToString(txn->GetResult()).c_str());
   }

src/executor/plan_executor.cpp

@@ -337,7 +337,12 @@ executor::AbstractExecutor *BuildExecutorTree(
           new executor::PopulateIndexExecutor(plan, executor_context);
       break;
     case PlanNodeType::RENAME:
-      child_executor = new executor::AlterExecutor(plan, executor_context);
+      child_executor =
+          new executor::AlterExecutor(plan, executor_context, false);
+      break;
+    case PlanNodeType::ALTER:
+      child_executor =
+          new executor::AlterExecutor(plan, executor_context, true);
       break;
     default:
       LOG_ERROR("Unsupported plan node type : %s",

src/include/executor/alter_executor.h

@@ -33,7 +33,7 @@ class AlterExecutor : public AbstractExecutor {
   AlterExecutor &operator=(AlterExecutor &&) = delete;
 
   AlterExecutor(const planner::AbstractPlan *node,
-                ExecutorContext *executor_context);
+                ExecutorContext *executor_context, bool isAlter);
 
   ~AlterExecutor() {}
 
@@ -44,6 +44,12 @@ class AlterExecutor : public AbstractExecutor {
 
   bool RenameColumn(const planner::RenamePlan &node,
                     concurrency::TransactionContext *txn);
+
+  bool DropColumn(const planner::AlterPlan &node,
+                  concurrency::TransactionContext *txn);
+
+ private:
+  bool isAlter_;
 };
 
 }  // executor