Modify types of column catalog object & add function for layout type

Author: ksaito7

src/catalog/column_catalog.cpp

@@ -30,10 +30,10 @@ ColumnCatalogObject::ColumnCatalogObject(executor::LogicalTile *tile,
       column_name(tile->GetValue(tupleId, ColumnCatalog::ColumnId::COLUMN_NAME)
                       .ToString()),
       column_id(tile->GetValue(tupleId, ColumnCatalog::ColumnId::COLUMN_ID)
-                    .GetAs<uint32_t>()),
+                    .GetAs<oid_t>()),
       column_offset(
           tile->GetValue(tupleId, ColumnCatalog::ColumnId::COLUMN_OFFSET)
-              .GetAs<uint32_t>()),
+              .GetAs<oid_t>()),
       column_type(StringToTypeId(
           tile->GetValue(tupleId, ColumnCatalog::ColumnId::COLUMN_TYPE)
               .ToString())),

src/include/catalog/column_catalog.h

@@ -44,8 +44,8 @@ class ColumnCatalogObject {
 
   inline oid_t GetTableOid() { return table_oid; }
   inline const std::string &GetColumnName() { return column_name; }
-  inline uint32_t GetColumnId() { return column_id; }
-  inline uint32_t GetColumnOffset() { return column_offset; }
+  inline oid_t GetColumnId() { return column_id; }
+  inline oid_t GetColumnOffset() { return column_offset; }
   inline type::TypeId GetColumnType() { return column_type; }
   inline size_t GetColumnLength() { return column_length; }
   inline bool IsInlined() { return is_inlined; }
@@ -56,8 +56,8 @@ class ColumnCatalogObject {
   // member variables
   oid_t table_oid;
   std::string column_name;
-  uint32_t column_id;
-  uint32_t column_offset;
+  oid_t column_id;
+  oid_t column_offset;
   type::TypeId column_type;
   size_t column_length;
   bool is_inlined;

src/include/storage/layout.h

@@ -68,6 +68,9 @@ class Layout : public Printable {
   /** @brief  Check whether this layout is a column store. */
   bool IsColumnStore() const { return (layout_type_ == LayoutType::COLUMN); }
 
+  /** @brief  Check whether this layout is a hybrid store. */
+  bool IsHybridStore() const { return (layout_type_ == LayoutType::HYBRID); }
+
   /** @brief  Return the layout_oid_ of this object. */
   oid_t GetOid() const { return layout_oid_; }
 

test/catalog/catalog_test.cpp

@@ -387,6 +387,8 @@ TEST_F(CatalogTests, LayoutCatalogTest) {
   auto first_default_layout = table->GetDefaultLayout();
   EXPECT_EQ(ROW_STORE_LAYOUT_OID, first_default_layout->GetOid());
   EXPECT_TRUE(first_default_layout->IsRowStore());
+  EXPECT_FALSE(first_default_layout->IsColumnStore());
+  EXPECT_FALSE(first_default_layout->IsHybridStore());
 
   // Check the first default layout in pg_layout and pg_table
   txn = txn_manager.BeginTransaction();
@@ -416,6 +418,7 @@ TEST_F(CatalogTests, LayoutCatalogTest) {
   EXPECT_EQ(default_layout_oid, table->GetDefaultLayout()->GetOid());
   EXPECT_FALSE(default_layout->IsColumnStore());
   EXPECT_FALSE(default_layout->IsRowStore());
+  EXPECT_TRUE(default_layout->IsHybridStore());
 
   // Check the changed default layout in pg_layout and pg_table
   txn = txn_manager.BeginTransaction();
@@ -442,6 +445,7 @@ TEST_F(CatalogTests, LayoutCatalogTest) {
   // Check the created layout
   EXPECT_FALSE(other_layout->IsColumnStore());
   EXPECT_FALSE(other_layout->IsRowStore());
+  EXPECT_TRUE(other_layout->IsHybridStore());
 
   // Check the created layout in pg_layout
   txn = txn_manager.BeginTransaction();
@@ -465,6 +469,8 @@ TEST_F(CatalogTests, LayoutCatalogTest) {
   // Check that default layout is reset and set to row_store.
   EXPECT_NE(default_layout, table->GetDefaultLayout());
   EXPECT_TRUE(table->GetDefaultLayout()->IsRowStore());
+  EXPECT_FALSE(table->GetDefaultLayout()->IsColumnStore());
+  EXPECT_FALSE(table->GetDefaultLayout()->IsHybridStore());
   EXPECT_EQ(ROW_STORE_LAYOUT_OID, table->GetDefaultLayout()->GetOid());
 
   // Query pg_layout and pg_table to ensure that the entry is dropped