Postfix for the dbb_guid movement

dyemanov · dyemanov · commit 9264932eee3e · 2025-02-21T13:41:09.000+03:00
diff --git a/src/jrd/ods.h b/src/jrd/ods.h
@@ -371,7 +371,7 @@ struct index_root_page
 									// alignment between 32-bit and 64-bit builds
 	struct irt_repeat
 	{
-		friend class index_root_page;	// to allow offset check for private members
+		friend struct index_root_page;	// to allow offset check for private members
 
 	private:
 		FB_UINT64 irt_transaction;		// transaction in progress
diff --git a/src/jrd/pag.cpp b/src/jrd/pag.cpp
@@ -1039,6 +1039,8 @@ void PAG_header(thread_db* tdbb, bool info, const TriState newForceWrite)
 	const auto replicaMode = (ReplicaMode) header->hdr_replica_mode;
 	dbb->dbb_replica_mode.store(replicaMode, std::memory_order_relaxed);
 
+	dbb->dbb_guid = Guid(header->hdr_guid);
+
 	// If database in backup lock state...
 	if (!info && dbb->dbb_backup_manager->getState() != Ods::hdr_nbak_normal)
 	{

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ struct index_root_page`
`371`	`371`	`// alignment between 32-bit and 64-bit builds`
`372`	`372`	`struct irt_repeat`
`373`	`373`	`{`
`374`		`- friend class index_root_page; // to allow offset check for private members`
	`374`	`+ friend struct index_root_page; // to allow offset check for private members`
`375`	`375`
`376`	`376`	`private:`
`377`	`377`	`FB_UINT64 irt_transaction; // transaction in progress`
Original file line number	Diff line number	Diff line change
`@@ -1039,6 +1039,8 @@ void PAG_header(thread_db* tdbb, bool info, const TriState newForceWrite)`
`1039`	`1039`	`const auto replicaMode = (ReplicaMode) header->hdr_replica_mode;`
`1040`	`1040`	`dbb->dbb_replica_mode.store(replicaMode, std::memory_order_relaxed);`
`1041`	`1041`
	`1042`	`+ dbb->dbb_guid = Guid(header->hdr_guid);`
	`1043`	`+`
`1042`	`1044`	`// If database in backup lock state...`
`1043`	`1045`	`if (!info && dbb->dbb_backup_manager->getState() != Ods::hdr_nbak_normal)`
`1044`	`1046`	`{`