dbb_guid cannot be optional anymore, except dbb being half-initialized

Author: dyemanov

src/common/os/guid.h

@@ -69,10 +69,18 @@ class Guid
 		"{%08X-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}";
 	static constexpr int GUID_FORMAT_ARGS = 11;
 
+	Guid()
+	{
+		memset(&m_data, 0, SIZE);
+	}
+
 public:
 	static constexpr ULONG SIZE = sizeof(UUID);
 
-	Guid() = delete;
+	static Guid empty()
+	{
+		return Guid();
+	}
 
 	Guid(const Guid& other)
 		: m_data(other.m_data)
@@ -84,7 +92,7 @@ class Guid
 
 	explicit Guid(const UCHAR* data)
 	{
-		memcpy(&m_data, data, sizeof(UUID));
+		memcpy(&m_data, data, SIZE);
 	}
 
 	Guid& operator=(const Guid& other)
@@ -95,7 +103,7 @@ class Guid
 
 	bool operator==(const Guid& other) const
 	{
-		return memcmp(&m_data, &other.m_data, sizeof(UUID)) == 0;
+		return memcmp(&m_data, &other.m_data, SIZE) == 0;
 	}
 
 	bool operator!=(const Guid& other) const
@@ -110,7 +118,7 @@ class Guid
 
 	void assign(const UCHAR* buffer)
 	{
-		memcpy(&m_data, buffer, sizeof(UUID));
+		memcpy(&m_data, buffer, SIZE);
 	}
 
 	void toString(char* buffer) const
@@ -160,7 +168,7 @@ class Guid
 
 	void copyTo(UCHAR* ptr) const
 	{
-		memcpy(ptr, &m_data, sizeof(UUID));
+		memcpy(ptr, &m_data, SIZE);
 	}
 
 	// Convert platform-dependent GUID into platform-independent form according to RFC 4122

src/jrd/Database.h

@@ -427,7 +427,7 @@ class Database : public pool_alloc<type_dbb>
 
 	MemoryPool* dbb_permanent;
 
-	std::optional<Firebird::Guid>	dbb_guid;		// database GUID
+	Firebird::Guid	dbb_guid;			// database GUID
 
 	Firebird::SyncObject	dbb_sync;
 	Firebird::SyncObject	dbb_sys_attach;		// synchronize operations with dbb_sys_attachments
@@ -608,6 +608,7 @@ class Database : public pool_alloc<type_dbb>
 private:
 	Database(MemoryPool* p, Firebird::IPluginConfig* pConf, bool shared)
 	:	dbb_permanent(p),
+		dbb_guid(Firebird::Guid::empty()),
 		dbb_page_manager(this, *p),
 		dbb_file_id(*p),
 		dbb_modules(*p),

src/jrd/Monitoring.cpp

@@ -936,7 +936,7 @@ void Monitoring::putDatabase(thread_db* tdbb, SnapshotData::DumpRecord& record)
 	record.storeInteger(f_mon_db_na, dbb->getLatestAttachmentId());
 	record.storeInteger(f_mon_db_ns, dbb->getLatestStatementId());
 
-	record.storeString(f_mon_db_guid, dbb->dbb_guid.value().toString());
+	record.storeString(f_mon_db_guid, dbb->dbb_guid.toString());
 	record.storeString(f_mon_db_file_id, dbb->getUniqueFileId());
 
 	record.storeInteger(f_mon_db_repl_mode, dbb->dbb_replica_mode);

src/jrd/SysFunction.cpp

@@ -4592,7 +4592,7 @@ dsc* evlGetContext(thread_db* tdbb, const SysFunction*, const NestValueArray& ar
 		else if (nameStr == DATABASE_NAME)
 			resultStr = dbb->dbb_database_name.ToString();
 		else if (nameStr == DATABASE_GUID)
-			resultStr = dbb->dbb_guid.value().toString();
+			resultStr = dbb->dbb_guid.toString();
         else if (nameStr == PAGES_ALLOCATED)
         {
             resultStr.printf("%" ULONGFORMAT, PageSpace::actAlloc(dbb));

src/jrd/inf.cpp

@@ -919,7 +919,7 @@ void INF_database_info(thread_db* tdbb,
 
 		case fb_info_db_guid:
 			{
-				const auto guidStr = dbb->dbb_guid.value().toString();
+				const auto guidStr = dbb->dbb_guid.toString();
 				if (!(info = INF_put_item(item, guidStr.length(), guidStr.c_str(), info, end)))
 					return;
 			}

src/jrd/jrd.cpp

@@ -3133,9 +3133,6 @@ JAttachment* JProvider::createDatabase(CheckStatusWrapper* user_status, const ch
 
 			dbb->dbb_page_manager.initTempPageSpace(tdbb);
 
-			dbb->dbb_guid = Guid::generate();
-			PAG_set_db_guid(tdbb, dbb->dbb_guid.value());
-
 			if (options.dpb_set_page_buffers)
 				PAG_set_page_buffers(tdbb, options.dpb_page_buffers);
 

src/jrd/pag.cpp

@@ -794,11 +794,12 @@ void PAG_format_header(thread_db* tdbb)
 
 	WIN window(HEADER_PAGE_NUMBER);
 	header_page* header = (header_page*) CCH_fake(tdbb, &window, 1);
+	header->hdr_header.pag_type = pag_header;
 	header->hdr_header.pag_scn = 0;
+	Guid::generate().copyTo(header->hdr_guid);
 	*(ISC_TIMESTAMP*) header->hdr_creation_date = TimeZoneUtil::getCurrentGmtTimeStamp().utc_timestamp;
 	// should we include milliseconds or not?
 	//TimeStamp::round_time(header->hdr_creation_date->timestamp_time, 0);
-	header->hdr_header.pag_type = pag_header;
 	header->hdr_page_size = dbb->dbb_page_size;
 	header->hdr_ods_version = ODS_VERSION | ODS_FIREBIRD_FLAG;
 	DbImplementation::current.store(header);
@@ -816,6 +817,8 @@ void PAG_format_header(thread_db* tdbb)
 	dbb->dbb_ods_version = header->hdr_ods_version & ~ODS_FIREBIRD_FLAG;
 	dbb->dbb_minor_version = header->hdr_ods_minor;
 
+	dbb->dbb_guid.assign(header->hdr_guid);
+
 	CCH_RELEASE(tdbb, &window);
 }
 
@@ -1039,7 +1042,7 @@ 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);
+	dbb->dbb_guid.assign(header->hdr_guid);
 
 	// If database in backup lock state...
 	if (!info && dbb->dbb_backup_manager->getState() != Ods::hdr_nbak_normal)

src/jrd/replication/Manager.cpp

@@ -110,7 +110,7 @@ Manager::Manager(const string& dbId,
 	const auto tdbb = JRD_get_thread_data();
 	const auto dbb = tdbb->getDatabase();
 
-	const auto& guid = dbb->dbb_guid.value();
+	const auto& guid = dbb->dbb_guid;
 	m_sequence = dbb->dbb_repl_sequence;
 
 	if (config->journalDirectory.hasData())

src/jrd/replication/Publisher.cpp

@@ -129,7 +129,7 @@ namespace
 			{
 				auto& pool = *attachment->att_pool;
 				const auto manager = dbb->replManager(true);
-				const auto& guid = dbb->dbb_guid.value();
+				const auto& guid = dbb->dbb_guid;
 				const auto& userName = attachment->getUserName();
 
 				attachment->att_replicator = FB_NEW Replicator(pool, manager, guid, userName);