Fix some reviewed stuff

Author: ksaito7

src/catalog/catalog.cpp

@@ -169,22 +169,22 @@ void Catalog::BootstrapSystemCatalogs(storage::Database *database,
   // pg_database record is shared across different databases
   system_catalogs->GetTableCatalog()->InsertTable(
       DATABASE_CATALOG_OID, DATABASE_CATALOG_NAME, CATALOG_SCHEMA_NAME,
-      CATALOG_DATABASE_OID, 0, pool_.get(), txn);
+      CATALOG_DATABASE_OID, ROW_STORE_LAYOUT_OID, pool_.get(), txn);
   system_catalogs->GetTableCatalog()->InsertTable(
       SCHEMA_CATALOG_OID, SCHEMA_CATALOG_NAME, CATALOG_SCHEMA_NAME,
-      database_oid, 0, pool_.get(), txn);
+      database_oid, ROW_STORE_LAYOUT_OID, pool_.get(), txn);
   system_catalogs->GetTableCatalog()->InsertTable(
       TABLE_CATALOG_OID, TABLE_CATALOG_NAME, CATALOG_SCHEMA_NAME, database_oid,
-			0, pool_.get(), txn);
+      ROW_STORE_LAYOUT_OID, pool_.get(), txn);
   system_catalogs->GetTableCatalog()->InsertTable(
       INDEX_CATALOG_OID, INDEX_CATALOG_NAME, CATALOG_SCHEMA_NAME, database_oid,
-			0, pool_.get(), txn);
+      ROW_STORE_LAYOUT_OID, pool_.get(), txn);
   system_catalogs->GetTableCatalog()->InsertTable(
       COLUMN_CATALOG_OID, COLUMN_CATALOG_NAME, CATALOG_SCHEMA_NAME,
-      database_oid, 0, pool_.get(), txn);
+      database_oid, ROW_STORE_LAYOUT_OID, pool_.get(), txn);
   system_catalogs->GetTableCatalog()->InsertTable(
       LAYOUT_CATALOG_OID, LAYOUT_CATALOG_NAME, CATALOG_SCHEMA_NAME,
-      database_oid, 0, pool_.get(), txn);
+      database_oid, ROW_STORE_LAYOUT_OID, pool_.get(), txn);
 }
 
 void Catalog::Bootstrap() {

src/catalog/column_catalog.cpp

@@ -39,7 +39,7 @@ ColumnCatalogObject::ColumnCatalogObject(executor::LogicalTile *tile,
               .ToString())),
       column_length(
 				  tile->GetValue(tupleId, ColumnCatalog::ColumnId::COLUMN_LENGTH)
-				      .GetAs<size_t>()),
+				      .GetAs<uint32_t>()),
       is_inlined(tile->GetValue(tupleId, ColumnCatalog::ColumnId::IS_INLINED)
                      .GetAs<bool>()),
       is_primary(tile->GetValue(tupleId, ColumnCatalog::ColumnId::IS_PRIMARY)
@@ -113,7 +113,7 @@ std::unique_ptr<catalog::Schema> ColumnCatalog::InitializeSchema() {
       catalog::Constraint(ConstraintType::NOTNULL, not_null_constraint_name));
 
   auto column_length_column = catalog::Column(
-      type::TypeId::BIGINT, type::Type::GetTypeSize(type::TypeId::BIGINT),
+      type::TypeId::INTEGER, type::Type::GetTypeSize(type::TypeId::INTEGER),
       "column_length", true);
   column_length_column.AddConstraint(
       catalog::Constraint(ConstraintType::NOTNULL, not_null_constraint_name));
@@ -162,7 +162,7 @@ bool ColumnCatalog::InsertColumn(oid_t table_oid,
   auto val3 = type::ValueFactory::GetIntegerValue(column_offset);
   auto val4 =
       type::ValueFactory::GetVarcharValue(TypeIdToString(column_type), nullptr);
-  auto val5 = type::ValueFactory::GetBigIntValue(column_length);
+  auto val5 = type::ValueFactory::GetIntegerValue(column_length);
   auto val6 = type::ValueFactory::GetBooleanValue(is_inlined);
   bool is_primary = false, is_not_null = false;
   for (auto constraint : constraints) {

src/catalog/system_catalogs.cpp

@@ -114,7 +114,6 @@ void SystemCatalogs::Bootstrap(const std::string &database_name,
 	pg_namespace_->UpdateOid(OID_FOR_USER_OFFSET);
 	pg_table_->UpdateOid(OID_FOR_USER_OFFSET);
 	pg_index_->UpdateOid(OID_FOR_USER_OFFSET);
-	// pg_layout_->UpdateOid(OID_FOR_USER_OFFSET);
 	pg_trigger_->UpdateOid(OID_FOR_USER_OFFSET);
 	// pg_proc->UpdateOid(OID_FOR_USER_OFFSET);
 }

src/catalog/table_catalog.cpp

@@ -696,7 +696,7 @@ bool TableCatalog::UpdateVersionId(oid_t update_val, oid_t table_oid,
  */
 bool TableCatalog::UpdateDefaultLayoutOid(oid_t update_val, oid_t table_oid,
                                    concurrency::TransactionContext *txn) {
-  std::vector<oid_t> update_columns({ColumnId::DEFAULT_LAYOUT_OID});  // defalut_layou_oid
+  std::vector<oid_t> update_columns({ColumnId::DEFAULT_LAYOUT_OID});  // defalut_layout_oid
   oid_t index_offset = IndexId::PRIMARY_KEY;  // Index of table_oid
   // values to execute index scan
   std::vector<type::Value> scan_values;

src/include/catalog/catalog_defaults.h

@@ -58,6 +58,10 @@ namespace catalog {
 #define CATALOG_SCHEMA_NAME "pg_catalog"
 #define DEFAULT_SCHEMA_NAME "public"
 
+// Reserved layout oid
+#define ROW_STORE_LAYOUT_OID 0
+#define COLUMN_STORE_LAYOUT_OID 1
+
 // Reserved pg_xxx table oid
 #define DATABASE_CATALOG_OID (0 | TABLE_OID_MASK)
 #define SCHEMA_CATALOG_OID (1 | TABLE_OID_MASK)

src/include/storage/layout.h

@@ -17,12 +17,6 @@
 #include "common/internal_types.h"
 #include "common/printable.h"
 
-//@{
-/** @brief  Pre-defined OIDs for ROW and COLUMN store.  */
-#define ROW_STORE_OID 0
-#define COLUMN_STORE_OID 1
-//@}
-
 namespace peloton {
 
 namespace catalog {

src/storage/data_table.cpp

@@ -67,7 +67,7 @@ DataTable::DataTable(catalog::Schema *schema, const std::string &table_name,
       database_oid(database_oid),
       table_name(table_name),
       tuples_per_tilegroup_(tuples_per_tilegroup),
-      current_layout_oid_(ATOMIC_VAR_INIT(COLUMN_STORE_OID)),
+      current_layout_oid_(ATOMIC_VAR_INIT(COLUMN_STORE_LAYOUT_OID)),
       adapt_table_(adapt_table),
       trigger_list_(new trigger::TriggerList()) {
   if (is_catalog == true) {

src/storage/layout.cpp

@@ -13,6 +13,7 @@
 #include <sstream>
 #include <string>
 
+#include "catalog/catalog_defaults.h"
 #include "catalog/column.h"
 #include "catalog/schema.h"
 #include "storage/layout.h"
@@ -27,9 +28,9 @@ Layout::Layout(const oid_t num_columns, LayoutType layout_type)
     : num_columns_(num_columns), layout_type_(layout_type) {
 	// Assign the oid
 	if (layout_type == LayoutType::ROW) {
-    layout_oid_ = ROW_STORE_OID;
+    layout_oid_ = ROW_STORE_LAYOUT_OID;
 	} else if (layout_type == LayoutType::COLUMN) {
-    layout_oid_ = COLUMN_STORE_OID;
+    layout_oid_ = COLUMN_STORE_LAYOUT_OID;
 	} else {
     layout_oid_ = INVALID_OID;
 	}
@@ -53,10 +54,10 @@ Layout::Layout(const column_map_type &column_map)
   // If a table has one column, it would be LayoutType::Row
   if (row_layout) {
     layout_type_ = LayoutType::ROW;
-    layout_oid_ = ROW_STORE_OID;
+    layout_oid_ = ROW_STORE_LAYOUT_OID;
   } else if (column_layout) {
     layout_type_ = LayoutType::COLUMN;
-    layout_oid_ = COLUMN_STORE_OID;
+    layout_oid_ = COLUMN_STORE_LAYOUT_OID;
   } else {
     // layout_oid_ is set to INVALID_OID, indicating that this
     // layout is not stored in the catalog and thus not persistent.
@@ -77,9 +78,9 @@ Layout::Layout(const column_map_type &column_map, const oid_t num_columns,
     : layout_oid_(layout_id),
       num_columns_(num_columns),
       column_layout_(column_map) {
-  if (layout_oid_ == ROW_STORE_OID) {
+  if (layout_oid_ == ROW_STORE_LAYOUT_OID) {
     layout_type_ = LayoutType::ROW;
-  } else if (layout_oid_ == COLUMN_STORE_OID) {
+  } else if (layout_oid_ == COLUMN_STORE_LAYOUT_OID) {
     layout_type_ = LayoutType::COLUMN;
   } else {
     layout_type_ = LayoutType::HYBRID;

test/catalog/catalog_test.cpp

@@ -385,7 +385,7 @@ TEST_F(CatalogTests, LayoutCatalogTest) {
 
   // Check the first default layout
   auto first_default_layout = table->GetDefaultLayout();
-  EXPECT_EQ(0, first_default_layout->GetOid());
+  EXPECT_EQ(ROW_STORE_LAYOUT_OID, first_default_layout->GetOid());
   EXPECT_TRUE(first_default_layout->IsRowStore());
 
   // Check the first default layout in pg_layout and pg_table
@@ -465,13 +465,13 @@ 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_EQ(0, table->GetDefaultLayout()->GetOid());
+  EXPECT_EQ(ROW_STORE_LAYOUT_OID, table->GetDefaultLayout()->GetOid());
 
   // Query pg_layout and pg_table to ensure that the entry is dropped
   txn = txn_manager.BeginTransaction();
   EXPECT_EQ(nullptr,
             pg_layout->GetLayoutWithOid(table_oid, default_layout_oid, txn));
-  EXPECT_EQ(0,
+  EXPECT_EQ(ROW_STORE_LAYOUT_OID,
   		catalog->GetTableObject(database_oid, table_oid, txn)->GetDefaultLayoutOid());
 
   // The additional layout must be present in pg_layout