This should fix #8986: Race condition between VIO_update_in_place and the garbage collector; update RDB$DATABASE in regular autonomous transaction

Author: AlexPeshkoff

src/dsql/DdlNodes.epp

@@ -6597,7 +6597,7 @@ bool RelationNode::checkDeletedId(thread_db* tdbb, MetaId& relId)
 	AutoCacheRequest request(tdbb, requestCacheId);
 	Attachment* attachment = tdbb->getAttachment();
 
-	FOR (REQUEST_HANDLE request)
+	FOR (REQUEST_HANDLE request TRANSACTION_HANDLE attachment->getMetaTransaction(tdbb))
 		P IN RDB$PAGES WITH
         P.RDB$RELATION_ID EQ relId
 	{
@@ -6636,10 +6636,10 @@ MetaId RelationNode::generateRelId(thread_db* tdbb, MetaName name)
 	Attachment* attachment = tdbb->getAttachment();
 	MetaId relId = 0;
 
-	static const CachedRequestId idDb;
-	AutoCacheRequest requestDb(tdbb, idDb);
+	AUTO_HANDLE(requestDb);
+	auto* metaTransaction = attachment->getMetaTransaction(tdbb);
 
-	FOR(REQUEST_HANDLE requestDb)
+	FOR(REQUEST_HANDLE requestDb TRANSACTION_HANDLE metaTransaction)
 		D IN RDB$DATABASE
 	{
 		MetaId startId = D.RDB$RELATION_ID;
@@ -6655,10 +6655,9 @@ MetaId RelationNode::generateRelId(thread_db* tdbb, MetaName name)
 			relId = startId;
 			enum {MISS, VALID, FREE} found = FREE;
 
-			static const CachedRequestId idRels;
-			AutoCacheRequest requestRels(tdbb, idRels);
+			AUTO_HANDLE(requestRels);
 
-			FOR(REQUEST_HANDLE requestRels)
+			FOR(REQUEST_HANDLE requestRels TRANSACTION_HANDLE metaTransaction)
 				R IN RDB$RELATIONS
 					WITH R.RDB$RELATION_ID GE startId
 						AND R.RDB$RELATION_ID LT stopId
@@ -6678,9 +6677,26 @@ MetaId RelationNode::generateRelId(thread_db* tdbb, MetaName name)
 
 			if (found == VALID)
 			{
-				MODIFY D USING
-					D.RDB$RELATION_ID = relId + 1;
-				END_MODIFY
+				AUTO_HANDLE(requestMod);
+
+				jrd_tra* previous = tdbb->getTransaction();
+				jrd_tra* traMod = TRA_start(tdbb, 0, DEFAULT_LOCK_TIMEOUT);
+				Cleanup rollback([&]()
+					{
+						if (traMod)
+							TRA_rollback(tdbb, traMod, false, true);
+						tdbb->setTransaction(previous);
+					});
+
+				FOR(REQUEST_HANDLE requestMod TRANSACTION_HANDLE traMod)
+					DBMOD IN RDB$DATABASE
+						MODIFY DBMOD USING
+							DBMOD.RDB$RELATION_ID = relId + 1;
+						END_MODIFY
+				END_FOR
+
+				TRA_commit(tdbb, traMod, false);
+				traMod = nullptr;
 
 // !!!!!! printf(" %d\n", relId); fflush(stdout);
 				return relId;

src/jrd/SystemTriggers.epp

@@ -1590,14 +1590,18 @@ void afterInsertRelation(thread_db* tdbb, Record* record)
 
 		// Do not access external file info from cache - it may be not usable yet
 		// On contrary rel_flags (and therefore check for view) are OK
-		if (relation && !EVL_field(nullptr, record, f_rel_ext_file, &desc) &&
-			!relation->isView())
+		fb_assert(relation);
+		if (relation)
 		{
-			// create the table
-			DPM_create_relation(tdbb, relation);
-		}
+			if (!EVL_field(nullptr, record, f_rel_ext_file, &desc) &&
+				!relation->isView())
+			{
+				// create the table
+				DPM_create_relation(tdbb, relation);
+			}
 
-		relation->rel_flags |= REL_get_dependencies;
+			relation->rel_flags |= REL_get_dependencies;
+		}
 	}
 
 }