Shared cache of generators appears to be working

Author: AlexPeshkoff

src/jrd/Attachment.cpp

@@ -132,8 +132,13 @@ void Jrd::Attachment::destroy(Attachment* const attachment)
 	}
 
 	Database* const dbb = attachment->att_database;
-	attachment->att_delayed_delete.garbageCollect(HazardDelayedDelete::GarbageCollectMethod::GC_FORCE);
-	dbb->dbb_delayed_delete.delayedDelete(attachment->att_delayed_delete.getHazardPointers());
+	{
+		// context scope is needed here for correct GC of hazard pointers
+		ThreadContextHolder tdbb(dbb, attachment);
+
+		attachment->att_delayed_delete.garbageCollect(HazardDelayedDelete::GarbageCollectMethod::GC_FORCE);
+		dbb->dbb_delayed_delete.delayedDelete(attachment->att_delayed_delete.getHazardPointers());
+	}
 
 	MemoryPool* const pool = attachment->att_pool;
 	Firebird::MemoryStats temp_stats;

src/jrd/HazardPtr.cpp

@@ -146,7 +146,9 @@ void HazardDelayedDelete::garbageCollect(GarbageCollectMethod gcMethod)
 	LocalHP localCopy;
 	localCopy.setSortMode(FB_ARRAY_SORT_MANUAL);
 	{
-		SyncLockGuard dbbSync(&database->dbb_sync, SYNC_SHARED, FB_FUNCTION);
+		Sync dbbSync(&database->dbb_sync, FB_FUNCTION);
+		if (!database->dbb_sync.ourExclusiveLock())
+			dbbSync.lock(SYNC_SHARED);
 
 		copyHazardPointers(tdbb, localCopy, database->dbb_attachments);
 		copyHazardPointers(tdbb, localCopy, database->dbb_sys_attachments);

src/jrd/met.h

@@ -208,7 +208,7 @@ class MetadataCache : public Firebird::PermanentStorage
 			for (FB_SIZE_T pos = 0; pos < m_objects.getCount(); ++pos)
 			{
 				Hazard<Object> val(tdbb, m_objects[pos]);
-				if (val->getKey() == key)
+				if (val.hasData() && val->getKey() == key)
 					return (SLONG) pos;
 			}
 
@@ -341,14 +341,12 @@ class MetadataCache : public Firebird::PermanentStorage
 
 	bool getSequence(thread_db* tdbb, SLONG id, MetaName& name)
 	{
-		GenObject genObj;
-		// !!!!!!!!!!!!!!!! Hazard<GenObject> hp(tdbb, &genObj);
 		Hazard<GenObject> hp(tdbb);
 
 		if (!mdc_generators.load(id, hp))
 			return false;
 
-		name = genObj.value;
+		name = hp->value;
 		return true;
 	}