duckdb 0.7.2-dev1803.0 → 0.7.2-dev1898.0

package/src/duckdb/src/storage/checkpoint_manager.cpp

@@ -128,8 +128,8 @@ void SingleFileCheckpointReader::LoadFromStorage() {
 	con.BeginTransaction();
 	// create the MetaBlockReader to read from the storage
 	MetaBlockReader reader(block_manager, meta_block);
-	reader.SetCatalog(&catalog.GetAttached().GetCatalog());
-	reader.SetContext(con.context.get());
+	reader.SetCatalog(catalog.GetAttached().GetCatalog());
+	reader.SetContext(*con.context);
 	LoadCheckpoint(*con.context, reader);
 	con.Commit();
 }

package/src/duckdb/src/storage/meta_block_reader.cpp

@@ -42,7 +42,8 @@ ClientContext &MetaBlockReader::GetContext() {
 	}
 	return *context;
 }
-Catalog *MetaBlockReader::GetCatalog() {
+
+optional_ptr<Catalog> MetaBlockReader::GetCatalog() {
 	return catalog;
 }
 
@@ -64,14 +65,14 @@ void MetaBlockReader::ReadNewBlock(block_id_t id) {
 	offset = sizeof(block_id_t);
 }
 
-void MetaBlockReader::SetCatalog(Catalog *catalog_p) {
+void MetaBlockReader::SetCatalog(Catalog &catalog_p) {
 	D_ASSERT(!catalog);
-	catalog = catalog_p;
+	catalog = &catalog_p;
 }
 
-void MetaBlockReader::SetContext(ClientContext *context_p) {
+void MetaBlockReader::SetContext(ClientContext &context_p) {
 	D_ASSERT(!context);
-	context = context_p;
+	context = &context_p;
 }
 
 } // namespace duckdb