Merge pull request #8818 from FirebirdSQL/work/gh-8817

This should fix bug #8817 : Fatal lock manager error: invalid lock id

Author: hvlad

src/jrd/Relation.h

@@ -404,6 +404,7 @@ inline constexpr ULONG REL_jrd_view			= 0x8000;	// relation is VIEW
 inline constexpr ULONG REL_gc_blocking		= 0x10000;	// request to downgrade\release gc lock
 inline constexpr ULONG REL_gc_disabled		= 0x20000;	// gc is disabled temporarily
 inline constexpr ULONG REL_gc_lockneed		= 0x40000;	// gc lock should be acquired
+inline constexpr ULONG REL_rescan			= 0x100000;	// rescan request was submitted while relation being scanning
 
 
 /// class jrd_rel

src/jrd/dfw.epp

@@ -6275,8 +6275,15 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
 		DFW_post_work(transaction, dfw_scan_relation, nullptr, nullptr, relation->rel_id);
 
 		// signal others about new format presence
-		LCK_lock(tdbb, relation->rel_rescan_lock, LCK_EX, LCK_WAIT);
 		LCK_release(tdbb, relation->rel_rescan_lock);
+		{
+			// Use temp lock to avoid AST call
+			Lock tmpLock(tdbb, sizeof(SLONG), LCK_rel_rescan);
+			tmpLock.setKey(relation->rel_id);
+
+			LCK_lock(tdbb, &tmpLock, LCK_EX, LCK_WAIT);
+			LCK_release(tdbb, &tmpLock);
+		}
 
 		break;
 	}

src/jrd/met.epp

@@ -127,6 +127,7 @@ static void save_trigger_data(thread_db*, TrigVector**, jrd_rel*, Statement*, bl
 	const QualifiedName*, FB_UINT64, SSHORT, USHORT, const MetaName&, const string&,
 	const bid*, TriState ssDefiner);
 static void scan_partners(thread_db*, jrd_rel*);
+static void scan_relation(thread_db*, jrd_rel*);
 static bool verify_TRG_ignore_perm(thread_db*, const QualifiedName&);
 
 
@@ -3917,6 +3918,27 @@ void MET_scan_relation(thread_db* tdbb, jrd_rel* relation)
  *      Scan a relation for view RecordSelExpr, computed by expressions, missing
  *      expressions, and validation expressions.
  *
+ **************************************/
+
+	while (!(relation->rel_flags & (REL_scanned | REL_deleted)))
+	{
+		scan_relation(tdbb, relation);
+	}
+}
+
+
+static void scan_relation(thread_db* tdbb, jrd_rel* relation)
+{
+/**************************************
+ *
+ *      s c a n _ r e l a t i o n
+ *
+ **************************************
+ *
+ * Functional description
+ *      Scan a relation for view RecordSelExpr, computed by expressions, missing
+ *      expressions, and validation expressions.
+ *
  **************************************/
 	SET_TDBB(tdbb);
 	TrigVector* triggers[TRIGGER_MAX];
@@ -3935,10 +3957,13 @@ void MET_scan_relation(thread_db* tdbb, jrd_rel* relation)
 
 	try {
 
-	if (relation->rel_flags & (REL_scanned | REL_deleted))
-		return;
+	fb_assert(!(relation->rel_flags & (REL_scanned | REL_deleted)));
 
 	relation->rel_flags |= REL_being_scanned;
+
+	LCK_lock(tdbb, relation->rel_rescan_lock, LCK_SR, LCK_WAIT);
+	relation->rel_flags &= ~REL_rescan;
+
 	dependencies = (relation->rel_flags & REL_get_dependencies) ? true : false;
 	relation->rel_flags &= ~REL_get_dependencies;
 
@@ -4232,9 +4257,14 @@ void MET_scan_relation(thread_db* tdbb, jrd_rel* relation)
 	// It's now time to place them at their rightful place inside the relation block.
 	relation->replaceTriggers(tdbb, triggers);
 
-	LCK_lock(tdbb, relation->rel_rescan_lock, LCK_SR, LCK_WAIT);
 	relation->rel_flags &= ~REL_being_scanned;
 
+	if (relation->rel_flags & REL_rescan)
+	{
+		LCK_release(tdbb, relation->rel_rescan_lock);
+		relation->rel_flags &= ~(REL_scanned | REL_rescan);
+	}
+
 	relation->rel_current_format = NULL;
 
 	}	// try
@@ -4542,8 +4572,13 @@ static int rescan_ast_relation(void* ast_object)
 
 		AsyncContextHolder tdbb(dbb, FB_FUNCTION, relation->rel_rescan_lock);
 
-		LCK_release(tdbb, relation->rel_rescan_lock);
-		relation->rel_flags &= ~REL_scanned;
+		if (relation->rel_flags & REL_being_scanned)
+			relation->rel_flags |= REL_rescan;
+		else
+		{
+			LCK_release(tdbb, relation->rel_rescan_lock);
+			relation->rel_flags &= ~REL_scanned;
+		}
 	}
 	catch (const Firebird::Exception&)
 	{} // no-op