add change column catalog

Author: DeanChensj

src/catalog/catalog.cpp

@@ -814,6 +814,7 @@ ResultType Catalog::AddColumn(
   return ResultType::SUCCESS;
 }
 
+<<<<<<< bc9252fda7aeecaeb325a11f30bc23a27569f932
 ResultType Catalog::DropColumn(
     UNUSED_ATTRIBUTE const std::string &database_name,
     UNUSED_ATTRIBUTE const std::string &table_name,
@@ -827,6 +828,13 @@ ResultType Catalog::ChangeColumnName(const std::string &database_name,
                                      const std::vector<std::string> &old_names,
                                      const std::vector<std::string> &names,
                                      concurrency::TransactionContext *txn) {
+=======
+ResultType ChangeColumnName(const std::string &database_name,
+                            const std::string &table_name,
+                            const std::vector<std::string> &old_names,
+                            const std::vector<std::string> &names,
+                            concurrency::TransactionContext *txn) {
+>>>>>>> add change column catalog
   if (txn == nullptr) {
     throw CatalogException("Change Column requires transaction.");
   }
@@ -835,8 +843,12 @@ ResultType Catalog::ChangeColumnName(const std::string &database_name,
     throw CatalogException("No names are given.");
   }
 
+<<<<<<< bc9252fda7aeecaeb325a11f30bc23a27569f932
   LOG_TRACE("Change Column Name %s to %s", old_names[0].c_str(),
             names[0].c_str());
+=======
+  LOG_TRACE("Change Column Name %s to %s", old_names[0], names[0]);
+>>>>>>> add change column catalog
 
   try {
     // Get table from the name

src/catalog/table_catalog.cpp

@@ -303,6 +303,15 @@ std::shared_ptr<ColumnCatalogObject> TableCatalogObject::GetColumnObject(
   return nullptr;
 }
 
+void TableCatalogObject::ChangeColumnName(
+    const std::vector<oid_t> &columns,
+    UNUSED_ATTRIBUTE const std::vector<std::string> &names) {
+  // TODO: Change column_names
+  // TODO: Change column_objects
+  TableCatalogObject::EvictColumnObject(columns[0]);
+  return;
+}
+
 TableCatalog *TableCatalog::GetInstance(storage::Database *pg_catalog,
                                         type::AbstractPool *pool,
                                         concurrency::TransactionContext *txn) {
@@ -394,7 +403,8 @@ bool TableCatalog::InsertTable(oid_t table_oid, const std::string &table_name,
  * @param   txn     TransactionContext
  * @return  Whether deletion is Successful
  */
-bool TableCatalog::DeleteTable(oid_t table_oid, concurrency::TransactionContext *txn) {
+bool TableCatalog::DeleteTable(oid_t table_oid,
+                               concurrency::TransactionContext *txn) {
   oid_t index_offset = IndexId::PRIMARY_KEY;  // Index of table_oid
   std::vector<type::Value> values;
   values.push_back(type::ValueFactory::GetIntegerValue(table_oid).Copy());

src/include/catalog/table_catalog.h

@@ -45,8 +45,8 @@ class TableCatalogObject {
   friend class ColumnCatalog;
 
  public:
-  TableCatalogObject(executor::LogicalTile *tile, concurrency::TransactionContext *txn,
-                     int tupleId = 0);
+  TableCatalogObject(executor::LogicalTile *tile,
+                     concurrency::TransactionContext *txn, int tupleId = 0);
 
  public:
   // Get indexes
@@ -71,6 +71,9 @@ class TableCatalogObject {
   std::shared_ptr<ColumnCatalogObject> GetColumnObject(
       const std::string &column_name, bool cached_only = false);
 
+  void ChangeColumnName(const std::vector<oid_t> &columns,
+                        const std::vector<std::string> &names);
+
   inline oid_t GetTableOid() { return table_oid; }
   inline const std::string &GetTableName() { return table_name; }
   inline oid_t GetDatabaseOid() { return database_oid; }
@@ -119,9 +122,10 @@ class TableCatalog : public AbstractCatalog {
   ~TableCatalog();
 
   // Global Singleton, only the first call requires passing parameters.
-  static TableCatalog *GetInstance(storage::Database *pg_catalog = nullptr,
-                                   type::AbstractPool *pool = nullptr,
-                                   concurrency::TransactionContext *txn = nullptr);
+  static TableCatalog *GetInstance(
+      storage::Database *pg_catalog = nullptr,
+      type::AbstractPool *pool = nullptr,
+      concurrency::TransactionContext *txn = nullptr);
 
   inline oid_t GetNextOid() { return oid_++ | TABLE_OID_MASK; }