Fixed #9068: Regression in fb6.0 restore "Implementation of text subtype 21 not located". Also fixed an issue with cache of charsets initialization.

Author: AlexPeshkoff

src/jrd/dfw.epp

@@ -392,6 +392,7 @@ static bool delete_trigger(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool modify_trigger(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool create_collation(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool delete_collation(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
+static bool commit_charset(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool delete_exception(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool set_generator(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool delete_generator(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
@@ -1207,6 +1208,7 @@ static inline constexpr deferred_task task_table[] =
 	{ dfw_delete_prm, delete_parameter },
 	{ dfw_create_collation, create_collation },
 	{ dfw_delete_collation, delete_collation },
+	{ dfw_commit_charset, commit_charset },
 	{ dfw_delete_exception, delete_exception },
 	{ dfw_set_generator, set_generator },
 	{ dfw_delete_generator, delete_generator },
@@ -3377,6 +3379,37 @@ static bool create_collation(thread_db* tdbb, SSHORT phase, DeferredWork* work,
 			work->getQualifiedName(), false);
 		return true;
 
+	case 2:
+		return true;
+
+	case 3:
+		DFW_post_work(transaction, dfw_commit_charset, nullptr, nullptr, CSetId(id));
+		return true;
+	}
+
+	return false;
+}
+
+
+static bool commit_charset(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_tra* transaction)
+{
+/**************************************
+ *
+ *	c o m m i t _ c h a r s e t
+ *
+ **************************************
+ *
+ * Functional description
+ *	Execute commit on charset id.
+ *
+ **************************************/
+
+	SET_TDBB(tdbb);
+	CSetId id(work->dfw_id);
+
+	switch (phase)
+	{
+	case 1:
 	case 2:
 	case 3:
 	case 4:
@@ -3387,7 +3420,7 @@ static bool create_collation(thread_db* tdbb, SSHORT phase, DeferredWork* work,
 	case 7:
 		{
 			auto* cs = MetadataCache::getPerm<Cached::CharSet>(tdbb, id, 0);
-			// fb_assert(cs);	--------------	breaks INI_ini()
+			fb_assert(cs);
 			if (cs)
 				cs->commit(tdbb);
 		}

src/jrd/ini.epp

@@ -1888,7 +1888,7 @@ static void store_intlnames(thread_db* tdbb, NonRelationSecurity& security)
 	for (const IntlManager::CharSetDefinition* charSet = IntlManager::defaultCharSets;
 		 charSet->name; ++charSet)
 	{
-		MetadataCache::getVersioned<Cached::CharSet>(tdbb, charSet->id, CacheFlag::UPGRADE | CacheFlag::NOCOMMIT);
+		MetadataCache::newVersion<Cached::CharSet>(tdbb, charSet->id);
 	}
 }
 

src/jrd/tra.h

@@ -536,8 +536,8 @@ enum dfw_t : int {
 	dfw_delete_prm,
 	dfw_create_collation,
 	dfw_delete_collation,
+	dfw_commit_charset,
 	dfw_delete_exception,
-	//dfw_unlink_file,
 	dfw_delete_generator,
 	dfw_create_function,
 	dfw_modify_function,