Refactor FunctionContext bootstrapping in DatabaseCatalog (#1187)

Co-authored-by: Joseph Koshakow <koshy44@gmail.com>
cmu-db · Sep 16, 2020 · 1fca44d · 1fca44d
1 parent b68a4a8
commit 1fca44d
Show file tree

Hide file tree

Showing 4 changed files with 182 additions and 323 deletions.
diff --git a/src/catalog/catalog.cpp b/src/catalog/catalog.cpp
@@ -100,11 +100,8 @@ bool Catalog::CreateDatabase(const common::ManagedPointer<transaction::Transacti
                              const bool bootstrap, const catalog::db_oid_t db_oid) {
   // Instantiate the DatabaseCatalog
   DatabaseCatalog *dbc = postgres::Builder::CreateDatabaseCatalog(catalog_block_store_, db_oid, garbage_collector_);
-  txn->RegisterAbortAction([=](transaction::DeferredActionManager *deferred_action_manager) {
-    dbc->TearDown(txn);
-    delete dbc;
-  });
-  bool success = Catalog::CreateDatabaseEntry(common::ManagedPointer(txn), db_oid, name, dbc);
+  txn->RegisterAbortAction([=](transaction::DeferredActionManager *deferred_action_manager) { delete dbc; });
+  const bool success = Catalog::CreateDatabaseEntry(common::ManagedPointer(txn), db_oid, name, dbc);
   if (bootstrap) dbc->Bootstrap(txn);  // Bootstrap the created database
   return success;
 }