Fix auto-merge conflict

Author: Dean Chen

src/catalog/abstract_catalog.cpp

@@ -178,73 +178,6 @@ bool AbstractCatalog::DeleteWithIndexScan(
   return status;
 }
 
-/* @brief   Update specific columns using index scan
- * @param   update_columns    Columns to be updated
- * @param   update_values     Values to be updated
- * @param   scan_values       Value to be scaned (used in index scan)
- * @param   index_offset      Offset of index for scan
- * @return  true if successfully executes
- */
-bool AbstractCatalog::UpdateWithIndexScan(
-    std::vector<oid_t> update_columns, std::vector<type::Value> update_values,
-    std::vector<type::Value> scan_values, oid_t index_offset,
-    concurrency::TransactionContext *txn) {
-  if (txn == nullptr) {
-    throw CatalogException("Scan table requires transaction");
-  }
-
-  std::unique_ptr<executor::ExecutorContext> context(
-      new executor::ExecutorContext(txn));
-  // Construct index scan executor
-  auto index = catalog_table_->GetIndex(index_offset);
-  oid_t index_oid = index->GetOid();
-  std::vector<oid_t> key_column_offsets =
-      index->GetMetadata()->GetKeySchema()->GetIndexedColumns();
-  PELOTON_ASSERT(scan_values.size() == key_column_offsets.size());
-  std::vector<ExpressionType> expr_types(scan_values.size(),
-                                         ExpressionType::COMPARE_EQUAL);
-  std::vector<expression::AbstractExpression *> runtime_keys;
-
-  planner::IndexScanPlan::IndexScanDesc index_scan_desc(
-      index_oid, key_column_offsets, expr_types, scan_values, runtime_keys);
-
-  planner::IndexScanPlan index_scan_node(catalog_table_, nullptr,
-                                         update_columns, index_scan_desc);
-
-  executor::IndexScanExecutor index_scan_executor(&index_scan_node,
-                                                  context.get());
-  // Construct update executor
-  TargetList target_list;
-  DirectMapList direct_map_list;
-
-  size_t column_count = catalog_table_->GetSchema()->GetColumnCount();
-  for (size_t col_itr = 0; col_itr < column_count; col_itr++) {
-    // Skip any column for update
-    if (std::find(std::begin(update_columns), std::end(update_columns),
-                  col_itr) == std::end(update_columns)) {
-      direct_map_list.emplace_back(col_itr, std::make_pair(0, col_itr));
-    }
-  }
-
-  PELOTON_ASSERT(update_columns.size() == update_values.size());
-  for (size_t i = 0; i < update_values.size(); i++) {
-    planner::DerivedAttribute update_attribute{
-        new expression::ConstantValueExpression(update_values[i])};
-    target_list.emplace_back(update_columns[i], update_attribute);
-  }
-
-  std::unique_ptr<const planner::ProjectInfo> project_info(
-      new planner::ProjectInfo(std::move(target_list),
-                               std::move(direct_map_list)));
-  planner::UpdatePlan update_node(catalog_table_, std::move(project_info));
-
-  executor::UpdateExecutor update_executor(&update_node, context.get());
-  update_executor.AddChild(&index_scan_executor);
-  // Execute
-  update_executor.Init();
-  return update_executor.Execute();
-}
-
 /*@brief   Index scan helper function
  * @param   column_offsets    Column ids for search (projection)
  * @param   index_offset      Offset of index for scan

src/catalog/catalog.cpp

@@ -1116,40 +1116,6 @@ ResultType Catalog::AlterTable(oid_t database_oid, oid_t table_oid, const std::s
   return ResultType::SUCCESS;
 }
 
-/**
- * @brief Add new columns to the table.
- * @param database_name database to which the table belongs to
- * @param table_name table to which the column belongs to
- * @param columns the column to be added
- * @param txn the transaction Context
- * @return TransactionContext ResultType(SUCCESS or FAILURE)
- *
- */
-ResultType Catalog::AddColumn(
-    UNUSED_ATTRIBUTE const std::string &database_name,
-    UNUSED_ATTRIBUTE const std::string &table_name,
-    UNUSED_ATTRIBUTE const std::vector<std::string> &columns,
-    UNUSED_ATTRIBUTE concurrency::TransactionContext *txn) {
-  // TODO: perform ADD Operation
-  return ResultType::SUCCESS;
-}
-
-/**
- * @brief Drop the column from the table.
- * @param database_name database to which the table belongs to
- * @param table_name table to which the columns belong to
- * @param columns the columns to be dropped
- * @param txn the transaction Context
- * @return TransactionContext ResultType(SUCCESS or FAILURE)
- */
-
-ResultType Catalog::DropColumn(UNUSED_ATTRIBUTE const std::string &database_name,
-                               UNUSED_ATTRIBUTE const std::string &table_name,
-                               UNUSED_ATTRIBUTE const std::vector<std::string> &columns,
-                               UNUSED_ATTRIBUTE concurrency::TransactionContext *txn) {
-  return ResultType::SUCCESS;
-}
-
 /**
  * @brief Change the column name in the catalog.
  * @param database_name database to which the table belongs to

src/include/catalog/abstract_catalog.h

@@ -62,12 +62,6 @@ class AbstractCatalog {
   bool DeleteWithIndexScan(oid_t index_offset, std::vector<type::Value> values,
                            concurrency::TransactionContext *txn);
 
-  bool UpdateWithIndexScan(std::vector<oid_t> update_columns,
-                           std::vector<type::Value> update_values,
-                           std::vector<type::Value> scan_values,
-                           oid_t index_offset,
-                           concurrency::TransactionContext *txn);
-
   std::unique_ptr<std::vector<std::unique_ptr<executor::LogicalTile>>>
   GetResultWithIndexScan(std::vector<oid_t> column_offsets, oid_t index_offset,
                          std::vector<type::Value> values,

src/include/catalog/catalog.h

@@ -196,16 +196,6 @@ class Catalog {
                         std::unique_ptr<catalog::Schema> &new_schema,
                         concurrency::TransactionContext *txn);
 
-  ResultType AddColumn(const std::string &database_name,
-                       const std::string &table_name,
-                       const std::vector<Column> &columns,
-                       concurrency::TransactionContext *txn);
-
-  ResultType DropColumn(const std::string &database_name,
-                        const std::string &table_name,
-                        const std::vector<Column> &columns,
-                        concurrency::TransactionContext *txn);
-
   ResultType RenameColumn(const std::string &database_name,
                           const std::string &table_name,
                           const std::string &old_name,