@@ -57,16 +57,16 @@ Catalog::Catalog() : pool_(new type::EphemeralPool()) {
5757 auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance ();
5858 auto txn = txn_manager.BeginTransaction ();
5959 auto storage_manager = storage::StorageManager::GetInstance ();
60- // Create pg_catalog database
61- auto pg_catalog = new storage::Database (CATALOG_DATABASE_OID);
62- pg_catalog ->setDBName (CATALOG_DATABASE_NAME);
63- storage_manager->AddDatabaseToStorageManager (pg_catalog );
60+ // Create peloton database
61+ auto peloton = new storage::Database (CATALOG_DATABASE_OID);
62+ peloton ->setDBName (CATALOG_DATABASE_NAME);
63+ storage_manager->AddDatabaseToStorageManager (peloton );
6464
6565 // Create catalog tables
66- DatabaseCatalog::GetInstance (pg_catalog , pool_.get (), txn);
67- BootstrapSystemCatalogs (pg_catalog , txn);
66+ DatabaseCatalog::GetInstance (peloton , pool_.get (), txn);
67+ BootstrapSystemCatalogs (peloton , txn);
6868
69- // Insert pg_catalog database into pg_database
69+ // Insert peloton database into pg_database
7070 DatabaseCatalog::GetInstance ()->InsertDatabase (
7171 CATALOG_DATABASE_OID, CATALOG_DATABASE_NAME, pool_.get (), txn);
7272
@@ -162,7 +162,7 @@ void Catalog::BootstrapSystemCatalogs(storage::Database *database,
162162 DEFUALT_SCHEMA_OID, DEFUALT_SCHEMA_NAME, pool_.get (), txn);
163163
164164 // Insert catalog tables into pg_table
165- // pg_database is shared across different databases
165+ // pg_database record is shared across different databases
166166 system_catalogs->GetTableCatalog ()->InsertTable (
167167 DATABASE_CATALOG_OID, DATABASE_CATALOG_NAME, CATALOG_SCHEMA_NAME,
168168 CATALOG_DATABASE_OID, pool_.get (), txn);
@@ -227,7 +227,6 @@ ResultType Catalog::CreateDatabase(const std::string &database_name,
227227
228228 // TODO: This should be deprecated, dbname should only exists in pg_db
229229 database->setDBName (database_name);
230-
231230 {
232231 std::lock_guard<std::mutex> lock (catalog_mutex);
233232 storage_manager->AddDatabaseToStorageManager (database);
0 commit comments