Fix all tests

Author: poojanilangekar

src/catalog/layout_catalog.cpp

@@ -2,7 +2,7 @@
 //
 //                         Peloton
 //
-// column_catalog.h
+// layout_catalog.h
 //
 // Identification: src/include/catalog/layout_catalog.cpp
 //
@@ -15,6 +15,7 @@
 #include "catalog/catalog.h"
 #include "catalog/system_catalogs.h"
 #include "concurrency/transaction_context.h"
+#include "executor/logical_tile.h"
 #include "storage/data_table.h"
 #include "storage/layout.h"
 
@@ -164,24 +165,32 @@ LayoutCatalog::GetLayouts(oid_t table_oid,
   auto result_tiles =
           GetResultWithIndexScan(column_ids, index_offset, values, txn);
 
-  for (auto &tile : (*result_tiles)) {
-    for (auto tuple_id : *tile) {
-      oid_t layout_oid =
-              tile->GetValue(tuple_id, LayoutCatalog::ColumnId::LAYOUT_OID)
-              .GetAs<oid_t>();
-      oid_t num_coulmns =
-              tile->GetValue(tuple_id, LayoutCatalog::ColumnId::NUM_COLUMNS)
-              .GetAs<oid_t>();
-
-      std::string column_map_str =
-              tile->GetValue(tuple_id, LayoutCatalog::ColumnId::COLUMN_MAP)
-                      .GetAs<std::string>();
-      auto column_map = storage::Layout::DeserializeColumnMap(num_coulmns,
-                                                              column_map_str);
-      auto layout_object =
-              std::make_shared<const storage::Layout>(column_map, layout_oid);
-      table_object->InsertLayout(layout_object);
-    }
+  // result_tiles should contain only 1 LogicalTile per table
+  auto result_size = (*result_tiles).size();
+  PELOTON_ASSERT(result_size <= 1);
+  if (result_size == 0) {
+    LOG_DEBUG("No entry for table %u in pg_layout", table_oid);
+    return table_object->GetLayouts();
+  }
+
+  // Get the LogicalTile
+  auto tile = (*result_tiles)[0].get();
+  auto tuple_count = tile->GetTupleCount();
+  for (oid_t tuple_id = 0; tuple_id < tuple_count; tuple_id++) {
+    oid_t layout_oid =
+            tile->GetValue(tuple_id, LayoutCatalog::ColumnId::LAYOUT_OID)
+                    .GetAs<oid_t>();
+    oid_t num_columns =
+            tile->GetValue(tuple_id, LayoutCatalog::ColumnId::NUM_COLUMNS)
+                    .GetAs<oid_t>();
+    std::string column_map_str =
+            tile->GetValue(tuple_id, LayoutCatalog::ColumnId::COLUMN_MAP)
+                    .ToString();
+    auto column_map = storage::Layout::DeserializeColumnMap(num_columns,
+                                                            column_map_str);
+    auto layout_object =
+            std::make_shared<const storage::Layout>(column_map, layout_oid);
+    table_object->InsertLayout(layout_object);
   }
 
   return table_object->GetLayouts();

src/include/storage/layout.h

@@ -2,7 +2,7 @@
 //
 //                         Peloton
 //
-// tuple.h
+// layout.h
 //
 // Identification: src/include/storage/layout.h
 //

src/storage/layout.cpp

@@ -2,7 +2,7 @@
 //
 //                         Peloton
 //
-// tuple.cpp
+// layout.cpp
 //
 // Identification: src/storage/layout.cpp
 //

test/catalog/catalog_test.cpp

@@ -235,9 +235,8 @@ TEST_F(CatalogTests, DroppingTable) {
   auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
   auto txn = txn_manager.BeginTransaction();
   auto catalog = catalog::Catalog::GetInstance();
-  // NOTE: everytime we create a database, there will be 8 catalog tables inside
-  EXPECT_EQ(
-      11,
+  // NOTE: everytime we create a database, there will be 9 catalog tables inside
+  EXPECT_EQ(CATALOG_TABLES_COUNT+3,
       (int)catalog->GetDatabaseObject("emp_db", txn)->GetTableObjects().size());
   auto database_object =
       catalog::Catalog::GetInstance()->GetDatabaseObject("emp_db", txn);
@@ -250,8 +249,7 @@ TEST_F(CatalogTests, DroppingTable) {
   EXPECT_NE(nullptr, database_object);
   auto department_table_object =
       database_object->GetTableObject("department_table", DEFAULT_SCHEMA_NAME);
-  EXPECT_EQ(
-      10,
+  EXPECT_EQ(CATALOG_TABLES_COUNT+2,
       (int)catalog->GetDatabaseObject("emp_db", txn)->GetTableObjects().size());
   txn_manager.CommitTransaction(txn);
 
@@ -263,8 +261,7 @@ TEST_F(CatalogTests, DroppingTable) {
                    "emp_db", DEFAULT_SCHEMA_NAME, "department_table", txn),
                CatalogException);
   //
-  EXPECT_EQ(
-      10,
+  EXPECT_EQ(CATALOG_TABLES_COUNT+2,
       (int)catalog->GetDatabaseObject("emp_db", txn)->GetTableObjects().size());
   txn_manager.CommitTransaction(txn);
 
@@ -273,17 +270,15 @@ TEST_F(CatalogTests, DroppingTable) {
   EXPECT_THROW(catalog::Catalog::GetInstance()->DropTable(
                    "emp_db", DEFAULT_SCHEMA_NAME, "void_table", txn),
                CatalogException);
-  EXPECT_EQ(
-      10,
+  EXPECT_EQ(CATALOG_TABLES_COUNT+2,
       (int)catalog->GetDatabaseObject("emp_db", txn)->GetTableObjects().size());
   txn_manager.CommitTransaction(txn);
 
   // Drop the other table
   txn = txn_manager.BeginTransaction();
   catalog::Catalog::GetInstance()->DropTable("emp_db", DEFAULT_SCHEMA_NAME,
                                              "emp_table", txn);
-  EXPECT_EQ(
-      9,
+  EXPECT_EQ(CATALOG_TABLES_COUNT+1,
       (int)catalog->GetDatabaseObject("emp_db", txn)->GetTableObjects().size());
   txn_manager.CommitTransaction(txn);
 }

test/executor/drop_test.cpp

@@ -109,16 +109,14 @@ TEST_F(DropTests, DroppingTable) {
   // NOTE: everytime we create a database, there will be 8 catalog tables inside
   EXPECT_EQ((int)catalog->GetDatabaseObject(TEST_DB_NAME, txn)
                 ->GetTableObjects()
-                .size(),
-            10);
+                .size(), (CATALOG_TABLES_COUNT + 2));
 
   // Now dropping the table using the executor
   catalog->DropTable(TEST_DB_NAME, DEFAULT_SCHEMA_NAME, "department_table",
                      txn);
   EXPECT_EQ((int)catalog->GetDatabaseObject(TEST_DB_NAME, txn)
                 ->GetTableObjects()
-                .size(),
-            9);
+                .size(), (CATALOG_TABLES_COUNT + 1));
 
   // free the database just created
   catalog->DropDatabaseWithName(TEST_DB_NAME, txn);
@@ -214,7 +212,7 @@ TEST_F(DropTests, DroppingTrigger) {
   txn = txn_manager.BeginTransaction();
   catalog->DropTable(TEST_DB_NAME, DEFAULT_SCHEMA_NAME, "department_table",
                      txn);
-  EXPECT_EQ(8, (int)catalog::Catalog::GetInstance()
+  EXPECT_EQ(CATALOG_TABLES_COUNT, (int)catalog::Catalog::GetInstance()
                    ->GetDatabaseObject(TEST_DB_NAME, txn)
                    ->GetTableObjects()
                    .size());