Fixed AnalyzeAllTables

Author: poojanilangekar

src/optimizer/stats/stats_storage.cpp

@@ -261,30 +261,38 @@ std::shared_ptr<TableStats> StatsStorage::GetTableStats(
 // Needs to be handled differently. Used only in tests.
 ResultType StatsStorage::AnalyzeStatsForAllTables(
     UNUSED_ATTRIBUTE concurrency::TransactionContext *txn) {
-//  if (txn == nullptr) {
-//    LOG_TRACE("Do not have transaction to analyze all tables' stats.");
-//    return ResultType::FAILURE;
-//  }
-//
-//  auto storage_manager = storage::StorageManager::GetInstance();
-//
-//  oid_t database_count = storage_manager->GetDatabaseCount();
-//  LOG_TRACE("Database count: %u", database_count);
-//  for (oid_t db_offset = 0; db_offset < database_count; db_offset++) {
-//    auto database = storage_manager->GetDatabaseWithOffset(db_offset);
-//    if (database->GetOid() == CATALOG_DATABASE_OID) {
-//      continue;
-//    }
-//    oid_t table_count = database->GetTableCount();
-//    for (oid_t table_offset = 0; table_offset < table_count; table_offset++) {
-//      auto table = database->GetTable(table_offset);
-//      LOG_TRACE("Analyzing table: %s", table->GetName().c_str());
-//      std::unique_ptr<TableStatsCollector> table_stats_collector(
-//          new TableStatsCollector(table));
-//      table_stats_collector->CollectColumnStats();
-//      InsertOrUpdateTableStats(table, table_stats_collector.get(), txn);
-//    }
-//  }
+  if (txn == nullptr) {
+    LOG_TRACE("Do not have transaction to analyze all tables' stats.");
+    return ResultType::FAILURE;
+  }
+
+  auto storage_manager = storage::StorageManager::GetInstance();
+
+  oid_t database_count = storage_manager->GetDatabaseCount();
+  LOG_TRACE("Database count: %u", database_count);
+  for (oid_t db_offset = 0; db_offset < database_count; db_offset++) {
+    auto database = storage_manager->GetDatabaseWithOffset(db_offset);
+    auto database_oid = database->GetOid();
+    if (database_oid == CATALOG_DATABASE_OID) {
+      continue;
+    }
+    auto pg_database = catalog::Catalog::GetInstance()
+            ->GetDatabaseObject(database_oid, txn);
+    auto table_objects = pg_database->GetTableObjects();
+    for (auto &table_object_entry : table_objects) {
+      auto table_oid = table_object_entry.first;
+      auto table_object = table_object_entry.second;
+      if (table_object->GetSchemaName() == CATALOG_SCHEMA_NAME) {
+        continue;
+      }
+      LOG_TRACE("Analyzing table: %s", table_object->GetTableName().c_str());
+      auto table = database->GetTableWithOid(table_oid);
+      std::unique_ptr<TableStatsCollector> table_stats_collector(
+              new TableStatsCollector(table));
+      table_stats_collector->CollectColumnStats();
+      InsertOrUpdateTableStats(table, table_stats_collector.get(), txn);
+    }
+  }
   return ResultType::SUCCESS;
 }
 

test/optimizer/stats_storage_test.cpp

@@ -232,43 +232,45 @@ TEST_F(StatsStorageTests, AnalyzeStatsForTableTest) {
 }
 
 // TODO: Add more tables.
-//TEST_F(StatsStorageTests, AnalyzeStatsForAllTablesTest) {
-//  const std::string db_name = "test_db";
-//  auto data_table = CreateTestDBAndTable();
-//
-//  StatsStorage *stats_storage = StatsStorage::GetInstance();
-//
-//  // Must pass in the transaction.
-//  ResultType result = stats_storage->AnalyzeStatsForAllTables();
-//  EXPECT_EQ(result, ResultType::FAILURE);
-//
-//  auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
-//  auto txn = txn_manager.BeginTransaction();
-//  result = stats_storage->AnalyzeStatsForAllTables(txn);
-//  EXPECT_EQ(result, ResultType::SUCCESS);
-//  txn_manager.CommitTransaction(txn);
-//
-//  // Check the correctness of the stats.
-//  VerifyAndPrintColumnStats(data_table, 4);
-//  TestingExecutorUtil::DeleteDatabase(db_name);
-//
-//}
+TEST_F(StatsStorageTests, AnalyzeStatsForAllTablesTest) {
+  const std::string db_name = "test_db";
+  auto data_table = CreateTestDBAndTable();
 
-//TEST_F(StatsStorageTests, GetTableStatsTest) {
-//  auto data_table = InitializeTestTable();
-//  StatsStorage *stats_storage = StatsStorage::GetInstance();
-//
-//  auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
-//  auto txn = txn_manager.BeginTransaction();
-//  stats_storage->AnalyzeStatsForAllTables(txn);
-//  txn_manager.CommitTransaction(txn);
-//
-//  txn = txn_manager.BeginTransaction();
-//  std::shared_ptr<TableStats> table_stats = stats_storage->GetTableStats(
-//      data_table->GetDatabaseOid(), data_table->GetOid(), txn);
-//  txn_manager.CommitTransaction(txn);
-//  EXPECT_EQ(table_stats->num_rows, tuple_count);
-//}
+  StatsStorage *stats_storage = StatsStorage::GetInstance();
+
+  // Must pass in the transaction.
+  ResultType result = stats_storage->AnalyzeStatsForAllTables();
+  EXPECT_EQ(result, ResultType::FAILURE);
+
+  auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
+  auto txn = txn_manager.BeginTransaction();
+  result = stats_storage->AnalyzeStatsForAllTables(txn);
+  EXPECT_EQ(result, ResultType::SUCCESS);
+  txn_manager.CommitTransaction(txn);
+
+  // Check the correctness of the stats.
+  VerifyAndPrintColumnStats(data_table, 4);
+  TestingExecutorUtil::DeleteDatabase(db_name);
+
+}
+
+TEST_F(StatsStorageTests, GetTableStatsTest) {
+  const std::string db_name = "test_db";
+  auto data_table = CreateTestDBAndTable();
+  StatsStorage *stats_storage = StatsStorage::GetInstance();
+
+  auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
+  auto txn = txn_manager.BeginTransaction();
+  stats_storage->AnalyzeStatsForAllTables(txn);
+  txn_manager.CommitTransaction(txn);
+
+  txn = txn_manager.BeginTransaction();
+  std::shared_ptr<TableStats> table_stats = stats_storage->GetTableStats(
+      data_table->GetDatabaseOid(), data_table->GetOid(), txn);
+  txn_manager.CommitTransaction(txn);
+  EXPECT_EQ(table_stats->num_rows, tuple_count);
+  TestingExecutorUtil::DeleteDatabase(db_name);
+}
 
 }  // namespace test
 }  // namespace peloton