Changed AnalyzeAllTables to AnalyzeAllTablesWithDatabaseOid

Author: poojanilangekar

src/include/optimizer/stats/stats_storage.h

@@ -67,7 +67,8 @@ class StatsStorage {
 
   /* Functions for triggerring stats collection */
 
-  ResultType AnalyzeStatsForAllTables(
+  ResultType AnalyzeStatsForAllTablesWithDatabaseOid(
+      oid_t database_oid,
       concurrency::TransactionContext *txn = nullptr);
 
   ResultType AnalyzeStatsForTable(

src/optimizer/stats/stats_storage.cpp

@@ -257,41 +257,32 @@ std::shared_ptr<TableStats> StatsStorage::GetTableStats(
  * AnalyzeStatsForAllTables - This function iterates all databases and
  * datatables to collect their stats and store them in the column_stats_catalog.
  */
-// Deprecating this function because the notion is no longer true.
-// Needs to be handled differently. Used only in tests.
-ResultType StatsStorage::AnalyzeStatsForAllTables(
+ResultType StatsStorage::AnalyzeStatsForAllTablesWithDatabaseOid(
+    oid_t database_oid,
     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);
-    auto database_oid = database->GetOid();
-    if (database_oid == CATALOG_DATABASE_OID) {
+  auto database = storage_manager->GetDatabaseWithOid(database);
+  PELOTON_ASSERT(database != nullptr);
+  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;
     }
-    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);
-    }
+    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

@@ -235,16 +235,18 @@ TEST_F(StatsStorageTests, AnalyzeStatsForTableTest) {
 TEST_F(StatsStorageTests, AnalyzeStatsForAllTablesTest) {
   const std::string db_name = "test_db";
   auto data_table = CreateTestDBAndTable();
+  auto db_oid = data_table->GetDatabaseOid();
 
   StatsStorage *stats_storage = StatsStorage::GetInstance();
 
   // Must pass in the transaction.
-  ResultType result = stats_storage->AnalyzeStatsForAllTables();
+  ResultType result = stats_storage
+          ->AnalyzeStatsForAllTablesWithDatabaseOid(db_oid);
   EXPECT_EQ(result, ResultType::FAILURE);
 
   auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
   auto txn = txn_manager.BeginTransaction();
-  result = stats_storage->AnalyzeStatsForAllTables(txn);
+  result = stats_storage->AnalyzeStatsForAllTablesWithDatabaseOid(db_oid, txn);
   EXPECT_EQ(result, ResultType::SUCCESS);
   txn_manager.CommitTransaction(txn);
 
@@ -257,16 +259,19 @@ TEST_F(StatsStorageTests, AnalyzeStatsForAllTablesTest) {
 TEST_F(StatsStorageTests, GetTableStatsTest) {
   const std::string db_name = "test_db";
   auto data_table = CreateTestDBAndTable();
+  auto db_oid = data_table->GetDatabaseOid();
+
   StatsStorage *stats_storage = StatsStorage::GetInstance();
 
   auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
   auto txn = txn_manager.BeginTransaction();
-  stats_storage->AnalyzeStatsForAllTables(txn);
+  ResultType result = stats_storage
+          ->AnalyzeStatsForAllTablesWithDatabaseOid(db_oid, 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);
+      db_oid, data_table->GetOid(), txn);
   txn_manager.CommitTransaction(txn);
   EXPECT_EQ(table_stats->num_rows, tuple_count);
   TestingExecutorUtil::DeleteDatabase(db_name);