Merge pull request #1 from DeanChensj/catlog

Change column catalog

Author: DeanChensj

src/catalog/catalog.cpp

@@ -287,6 +287,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) {
@@ -378,7 +387,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/catalog/table_catalog.cpp

@@ -15,6 +15,7 @@
 #include <mutex>
 
 #include "catalog/catalog_defaults.h"
+#include "catalog/column_catalog.h"
 #include "function/functions.h"
 
 namespace peloton {
@@ -176,6 +177,30 @@ class Catalog {
   std::shared_ptr<TableCatalogObject> GetTableObject(
       oid_t database_oid, oid_t table_oid,
       concurrency::TransactionContext *txn);
+
+  //===--------------------------------------------------------------------===//
+  // ALTER TABLE
+  //===--------------------------------------------------------------------===//
+  ResultType AlterTable(oid_t database_oid, oid_t table_oid,
+                        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 ChangeColumnName(const std::string &database_name,
+                              const std::string &table_name,
+                              const std::vector<Column> &old_columns,
+                              const std::vector<std::string> &names,
+                              concurrency::TransactionContext *txn);
+
   //===--------------------------------------------------------------------===//
   // DEPRECATED FUNCTIONS
   //===--------------------------------------------------------------------===//

src/include/catalog/catalog.h

@@ -144,6 +144,10 @@ class Schema : public Printable {
     return index;
   }
 
+  inline void ChangeColumnName(const oid_t column_id, std::string new_name) {
+    columns[column_id].column_name = new_name;
+  }
+
   inline oid_t GetUninlinedColumn(const oid_t column_id) const {
     return uninlined_columns[column_id];
   }
@@ -191,7 +195,7 @@ class Schema : public Printable {
   }
 
   // Get the default value for the column
-  inline type::Value* GetDefaultValue(const oid_t column_id) const {
+  inline type::Value *GetDefaultValue(const oid_t column_id) const {
     for (auto constraint : columns[column_id].GetConstraints()) {
       if (constraint.GetType() == ConstraintType::DEFAULT) {
         return constraint.getDefaultValue();

src/include/catalog/schema.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; }
 

src/include/catalog/table_catalog.h

@@ -72,6 +72,9 @@ class Database : public Printable {
   std::string GetDBName();
   void setDBName(const std::string &database_name);
 
+  storage::DataTable *ReplaceTableWithOid(const oid_t table_oid,
+                                          storage::DataTable *new_table);
+
  protected:
   //===--------------------------------------------------------------------===//
   // MEMBERS

src/include/storage/database.h

@@ -139,6 +139,10 @@ class Tile : public Printable {
     return schema.GetColumn(column_index).GetName();
   }
 
+  void ChangeColumnName(const oid_t column_index, const std::string name) {
+    schema.ChangeColumnName(column_index, name);
+  }
+
   inline oid_t GetColumnCount() const { return column_count; };
 
   inline TileGroupHeader *GetHeader() const { return tile_group_header; }

src/include/storage/tile.h

@@ -184,5 +184,25 @@ void Database::setDBName(const std::string &database_name) {
   Database::database_name = database_name;
 }
 
+storage::DataTable *Database::ReplaceTableWithOid(
+    const oid_t table_oid, storage::DataTable *new_table) {
+  {
+    std::lock_guard<std::mutex> lock(database_mutex);
+
+    oid_t table_offset = 0;
+    for (auto table : tables) {
+      if (table->GetOid() == table_oid) {
+        break;
+      }
+      table_offset++;
+    }
+    PL_ASSERT(table_offset < tables.size());
+
+    auto old_table = tables.at(table_offset);
+    tables[table_offset] = new_table;
+    return old_table;
+  }
+}
+
 }  // namespace storage
 }  // namespace peloton