LayoutTunerTest fixed

Author: poojanilangekar

src/catalog/catalog.cpp

@@ -18,6 +18,7 @@
 #include "catalog/index_catalog.h"
 #include "catalog/index_metrics_catalog.h"
 #include "catalog/language_catalog.h"
+#include "catalog/layout_catalog.h"
 #include "catalog/proc_catalog.h"
 #include "catalog/query_history_catalog.h"
 #include "catalog/query_metrics_catalog.h"
@@ -65,6 +66,7 @@ Catalog::Catalog() : pool_(new type::EphemeralPool()) {
   auto pg_database = DatabaseCatalog::GetInstance(pg_catalog, pool_.get(), txn);
   auto pg_table = TableCatalog::GetInstance(pg_catalog, pool_.get(), txn);
   IndexCatalog::GetInstance(pg_catalog, pool_.get(), txn);
+  LayoutCatalog::GetInstance(pg_catalog, pool_.get(), txn);
   //  ColumnCatalog::GetInstance(); // Called implicitly
 
   // Create indexes on catalog tables, insert them into pg_index
@@ -136,6 +138,8 @@ Catalog::Catalog() : pool_(new type::EphemeralPool()) {
                         CATALOG_DATABASE_OID, pool_.get(), txn);
   pg_table->InsertTable(COLUMN_CATALOG_OID, COLUMN_CATALOG_NAME,
                         CATALOG_DATABASE_OID, pool_.get(), txn);
+  pg_table->InsertTable(LAYOUT_CATALOG_OID, LAYOUT_CATALOG_NAME,
+                        CATALOG_DATABASE_OID, pool_.get(), txn);
 
   // Commit transaction
   txn_manager.CommitTransaction(txn);
@@ -564,6 +568,7 @@ ResultType Catalog::DropTable(oid_t database_oid, oid_t table_oid,
 
   for (auto it : index_objects) DropIndex(it.second->GetIndexOid(), txn);
   ColumnCatalog::GetInstance()->DeleteColumns(table_oid, txn);
+  LayoutCatalog::GetInstance()->DeleteLayouts(table_oid, txn);
   TableCatalog::GetInstance()->DeleteTable(table_oid, txn);
 
   database->GetTableWithOid(table_oid);

src/include/storage/data_table.h

@@ -248,7 +248,9 @@ class DataTable : public AbstractTable {
 
   void ClearLayoutSamples();
 
-  void SetDefaultLayout(const column_map_type &column_map);
+  bool SetDefaultLayout(const column_map_type &column_map,
+                        type::AbstractPool *pool,
+                        concurrency::TransactionContext *txn);
 
   const Layout& GetDefaultLayout() const;
 

src/include/tuning/layout_tuner.h

@@ -27,6 +27,10 @@ namespace storage {
 class DataTable;
 }
 
+namespace type {
+class AbstractPool;
+}
+
 namespace tuning {
 
 //===--------------------------------------------------------------------===//
@@ -81,14 +85,6 @@ class LayoutTuner {
    */
   void ClearTables();
 
-  /**
-   * @brief      Gets the column map information.
-   *
-   * @param[in]  column_map  The column map
-   *
-   * @return     The column map information.
-   */
-  std::string GetColumnMapInfo(const column_map_type &column_map);
 
  protected:
   /**
@@ -142,6 +138,9 @@ class LayoutTuner {
   /** Desired layout tile count */
   oid_t tile_count = 2;
 
+  /** Pool to add new layouts in the pg_layout table */
+  std::unique_ptr<type::AbstractPool> pool_;
+
 };
 
 }  // namespace indextuner

src/storage/data_table.cpp

@@ -16,6 +16,7 @@
 #include "tuning/clusterer.h"
 #include "tuning/sample.h"
 #include "catalog/foreign_key.h"
+#include "catalog/layout_catalog.h"
 #include "catalog/table_catalog.h"
 #include "catalog/trigger_catalog.h"
 #include "common/container_tuple.h"
@@ -31,7 +32,6 @@
 #include "storage/abstract_table.h"
 #include "storage/data_table.h"
 #include "storage/database.h"
-#include "storage/layout.h"
 #include "storage/storage_manager.h"
 #include "storage/tile.h"
 #include "storage/tile_group.h"
@@ -1368,10 +1368,18 @@ void DataTable::ClearIndexSamples() {
   }
 }
 
-void DataTable::SetDefaultLayout(const column_map_type &column_map) {
-  // TODO Pooja: Generate layout_oid_ and add it to the catalog
-  default_layout_ = std::shared_ptr<const Layout>(
-          new const Layout(column_map));
+bool DataTable::SetDefaultLayout(const column_map_type &column_map,
+                                 type::AbstractPool *pool,
+                                 concurrency::TransactionContext *txn) {
+  oid_t layout_id = GetNextLayoutOid();
+  auto new_layout = std::shared_ptr<const Layout>(
+          new const Layout(column_map, layout_id));
+  auto layout_catalog = catalog::LayoutCatalog::GetInstance();
+  bool result = layout_catalog->InsertLayout(table_oid, new_layout, pool, txn);
+  if (result) {
+    default_layout_ = new_layout;
+  }
+  return result;
 }
 
 const Layout& DataTable::GetDefaultLayout() const {

src/tuning/layout_tuner.cpp

@@ -19,7 +19,9 @@
 #include "catalog/schema.h"
 #include "common/logger.h"
 #include "common/timer.h"
+#include "concurrency/transaction_manager_factory.h"
 #include "storage/data_table.h"
+#include "type/ephemeral_pool.h"
 
 namespace peloton {
 namespace tuning {
@@ -30,7 +32,7 @@ LayoutTuner& LayoutTuner::GetInstance() {
 }
 
 LayoutTuner::LayoutTuner() {
-  // Nothing to do here !
+  pool_.reset(new type::EphemeralPool());
 }
 
 LayoutTuner::~LayoutTuner() {}
@@ -45,42 +47,6 @@ void LayoutTuner::Start() {
   LOG_INFO("Started layout tuner");
 }
 
-/**
- * @brief Print information from column map, used to inspect layout generated
- * from clusterer.
- *
- * @param column_map The column map to be printed.
- */
-std::string LayoutTuner::GetColumnMapInfo(const column_map_type& column_map) {
-  std::stringstream ss;
-  std::map<oid_t, std::vector<oid_t>> tile_column_map;
-
-  // Construct a tile_id => [col_ids] map
-  for (auto itr = column_map.begin(); itr != column_map.end(); itr++) {
-    oid_t col_id = itr->first;
-    oid_t tile_id = itr->second.first;
-
-    if (tile_column_map.find(tile_id) == tile_column_map.end()) {
-      tile_column_map[tile_id] = {};
-    }
-
-    tile_column_map[tile_id].push_back(col_id);
-  }
-
-  // Construct a string from tile_col_map
-  for (auto itr = tile_column_map.begin(); itr != tile_column_map.end();
-       itr++) {
-    oid_t tile_id = itr->first;
-    ss << tile_id << ": ";
-    for (oid_t col_id : itr->second) {
-      ss << col_id << " ";
-    }
-    ss << " :: ";
-  }
-
-  return ss.str();
-}
-
 Sample GetClustererSample(const Sample& sample, oid_t column_count) {
 
   // Copy over the sample
@@ -142,12 +108,23 @@ void LayoutTuner::UpdateDefaultPartition(storage::DataTable* table) {
   table->ClearLayoutSamples();
 
   // Desired number of tiles
-  auto layout = clusterer.GetPartitioning(tile_count);
-
-  LOG_TRACE("%s", GetColumnMapInfo(layout).c_str());
+  auto column_map = clusterer.GetPartitioning(tile_count);
 
   // Update table layout
-  table->SetDefaultLayout(layout);
+  // Since we need the layout to be updated in the catalog,
+  // Start a transaction before updating the default layout.
+  auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
+  auto *txn = txn_manager.BeginTransaction();
+  bool result = table->SetDefaultLayout(column_map, pool_.get(), txn);
+  if (!result) {
+    txn_manager.AbortTransaction(txn);
+    LOG_DEBUG("Layout Update to failed.");
+    return;
+  }
+  txn_manager.CommitTransaction(txn);
+
+  UNUSED_ATTRIBUTE auto layout = table->GetDefaultLayout();
+  LOG_TRACE("Updated Layout: %s", layout.GetInfo().c_str());
 }
 
 void LayoutTuner::Tune() {

test/executor/testing_executor_util.cpp

@@ -419,6 +419,29 @@ storage::DataTable *TestingExecutorUtil::CreateTable(
   return table;
 }
 
+storage::DataTable *TestingExecutorUtil::CreateTableUpdateCatalog(
+        int tuples_per_tilegroup_count, std::string &db_name) {
+  auto table_schema = std::unique_ptr<catalog::Schema>(new catalog::Schema(
+          {GetColumnInfo(0), GetColumnInfo(1), GetColumnInfo(2), GetColumnInfo(3)}));
+  std::string table_name("test_table");
+
+  bool is_catalog = false;
+  auto *catalog = catalog::Catalog::GetInstance();
+  auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
+  auto txn = txn_manager.BeginTransaction();
+  // Insert table in catalog
+  catalog->CreateTable(db_name, table_name, std::move(table_schema),
+                       txn, is_catalog, tuples_per_tilegroup_count);
+  txn_manager.EndTransaction(txn);
+
+  txn = txn_manager.BeginTransaction();
+  auto test_db = catalog->GetDatabaseWithName(db_name, txn);
+  txn_manager.EndTransaction(txn);
+
+  auto table = test_db->GetTableWithName(table_name);
+  return table;
+}
+
 /**
  * @brief Convenience method to create table for test.
  *

test/include/executor/testing_executor_util.h

@@ -75,6 +75,10 @@ class TestingExecutorUtil {
       int tuples_per_tilegroup_count = TESTS_TUPLES_PER_TILEGROUP,
       bool indexes = true, oid_t table_oid = INVALID_OID);
 
+  /** @brief Creates a basic table and adds its entry to the catalog */
+  static storage::DataTable *CreateTableUpdateCatalog(
+          int tuples_per_tilegroup_count, std::string &db_name);
+
   /** @brief Creates a basic table with allocated and populated tuples */
   static storage::DataTable *CreateAndPopulateTable();
 

test/tuning/layout_tuner_test.cpp

@@ -6,7 +6,7 @@
 //
 // Identification: test/tuning/layout_tuner_test.cpp
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-16, Carnegie Mellon University Databa e Group
 //
 //===----------------------------------------------------------------------===//
 
@@ -38,14 +38,17 @@ TEST_F(LayoutTunerTests, BasicTest) {
 
   const int tuple_count = TESTS_TUPLES_PER_TILEGROUP;
 
+  std::string db_name = "test_db";
+  TestingExecutorUtil::InitializeDatabase(db_name);
+
+  auto data_table = TestingExecutorUtil::CreateTableUpdateCatalog(tuple_count, db_name);
+
+
   // Create a table and populate it
   auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
   auto txn = txn_manager.BeginTransaction();
-  std::unique_ptr<storage::DataTable> data_table(
-      TestingExecutorUtil::CreateTable(tuple_count, false));
-  TestingExecutorUtil::PopulateTable(data_table.get(), tuple_count, false,
-  false,
-                                   true, txn);
+  TestingExecutorUtil::PopulateTable(data_table, tuple_count, false,
+                                     false, true, txn);
   txn_manager.CommitTransaction(txn);
 
   // Check column count
@@ -56,7 +59,7 @@ TEST_F(LayoutTunerTests, BasicTest) {
   tuning::LayoutTuner &layout_tuner = tuning::LayoutTuner::GetInstance();
 
   // Attach table to index tuner
-  layout_tuner.AddTable(data_table.get());
+  layout_tuner.AddTable(data_table);
 
   // Check old default tile group layout
   auto old_default_layout = data_table->GetDefaultLayout();
@@ -121,6 +124,8 @@ TEST_F(LayoutTunerTests, BasicTest) {
   EXPECT_EQ(new_default_layout.GetTileIdFromColumnId(1),0);
   EXPECT_EQ(new_default_layout.GetTileIdFromColumnId(2),0);
   EXPECT_EQ(new_default_layout.GetTileIdFromColumnId(3),1);
+
+  TestingExecutorUtil::DeleteDatabase(db_name);
 }
 
 }  // namespace test