Fixed privately reported by Pavel Zotov issue with inability to use "gbak -icu" for old databases when ICU version changed

Author: AlexPeshkoff

src/common/TextType.cpp

@@ -105,6 +105,9 @@ namespace Firebird {
 TextType::TextType(TTypeId _type, texttype *_tt, USHORT _attributes, CharSet* _cs)
 	: tt(_tt), cs(_cs), type(_type), attributes(_attributes)
 {
+	if (!tt)
+		return;
+
 	if (cs->getSqlMatchAnyLength() != 0)
 	{
 		canonical(cs->getSqlMatchAnyLength(), cs->getSqlMatchAny(),

src/jrd/Collation.cpp

@@ -1070,8 +1070,6 @@ class CollationImpl : public Collation
 template <typename T>
 Collation* newCollation(MemoryPool& pool, TTypeId id, texttype* tt, USHORT attributes, CharSet* cs)
 {
-	using namespace Firebird;
-
 	typedef StartsMatcher<UCHAR, NullStrConverter> StartsMatcherUCharDirect;
 	typedef StartsMatcher<UCHAR, CanonicalConverter<> > StartsMatcherUCharCanonical;
 	typedef ContainsMatcher<UCHAR, UpcaseConverter<> > ContainsMatcherUCharDirect;
@@ -1092,6 +1090,9 @@ Collation* newCollation(MemoryPool& pool, TTypeId id, texttype* tt, USHORT attri
 		SleuthMatcher<T>
 	> NonDirectImpl;
 
+	if (!tt)
+		return FB_NEW_POOL(pool) DirectImpl(id, nullptr, attributes, cs);
+
 	if (tt->texttype_flags & TEXTTYPE_DIRECT_MATCH)
 		return FB_NEW_POOL(pool) DirectImpl(id, tt, attributes, cs);
 	else
@@ -1107,8 +1108,17 @@ Collation* newCollation(MemoryPool& pool, TTypeId id, texttype* tt, USHORT attri
 namespace Jrd {
 
 
-Collation* Collation::createInstance(MemoryPool& pool, TTypeId id, texttype* tt, USHORT attributes, CharSet* cs)
+Collation* Collation::createInstance(MemoryPool& pool, TTypeId id, texttype* tt, Firebird::IStatus* error, USHORT attributes, CharSet* cs)
 {
+	if (!tt)
+	{
+		fb_assert(error);
+		auto coll = newCollation<UCHAR>(pool, id, tt, attributes, cs);
+		coll->error = error;
+
+		return coll;
+	}
+
 	switch (tt->texttype_canonical_width)
 	{
 		case 1:
@@ -1128,12 +1138,24 @@ Collation* Collation::createInstance(MemoryPool& pool, TTypeId id, texttype* tt,
 
 void Collation::destroy(thread_db* tdbb)
 {
-	if (tt->texttype_fn_destroy)
-		tt->texttype_fn_destroy(tt);
+	if (tt)
+	{
+		if (tt->texttype_fn_destroy)
+			tt->texttype_fn_destroy(tt);
+
+		delete tt;
+	}
 
-	delete tt;
+	if (error)
+		error->dispose();
 
 	delete this;
 }
 
+[[noreturn]] void Collation::raiseError()
+{
+	fb_assert(error);
+	status_exception::raise(error);
+}
+
 }	// namespace Jrd

src/jrd/Collation.h

@@ -52,13 +52,12 @@ class PatternMatcher;
 class Collation : public Firebird::TextType
 {
 public:
-	static Collation* createInstance(MemoryPool& pool, TTypeId id, texttype* tt,
+	static Collation* createInstance(MemoryPool& pool, TTypeId id, texttype* tt, Firebird::IStatus* error,
 		USHORT attributes, Firebird::CharSet* cs);
 
 protected:
 	Collation(TTypeId id, texttype *a_tt, USHORT a_attributes, Firebird::CharSet* a_cs)
-		: TextType(id, a_tt, a_attributes, a_cs),
-		  obsolete(false)
+		: TextType(id, a_tt, a_attributes, a_cs)
 	{
 	}
 
@@ -91,8 +90,17 @@ class Collation : public Firebird::TextType
 	void incUseCount(thread_db* tdbb);
 	void decUseCount(thread_db* tdbb);
 
-public:
-	bool obsolete;
+	Collation* validate()
+	{
+		if (tt)
+			return this;
+
+		raiseError();
+	}
+
+private:
+	Firebird::IStatus* error = nullptr;
+	[[noreturn]] void raiseError();
 };
 
 }	// namespace Jrd

src/jrd/intl.cpp

@@ -167,7 +167,7 @@ CharSetContainer* CharSetContainer::lookupCharset(thread_db* tdbb, TTypeId ttype
 	if (id == CS_dynamic)
 		id = tdbb->getCharSet();
 
-	return MetadataCache::getPerm<Cached::CharSet>(tdbb, id, CacheFlag::AUTOCREATE);
+	return MetadataCache::getPerm<Cached::CharSet>(tdbb, id, CacheFlag::AUTOCREATE | CacheFlag::MINISCAN);
 }
 
 
@@ -265,14 +265,14 @@ Collation* CharSetVers::getCollation(CollId id)
 	if (USHORT(id) >= charset_collations.getCount() || !charset_collations[id])
 		return nullptr;
 
-	return charset_collations[id];
+	return charset_collations[id]->validate();
 }
 
 Collation* CharSetVers::getCollation(const QualifiedName& name)
 {
 	FB_SIZE_T pos;
 	if (charset_collations.find([name](Collation* col) { return col->name == name; }, pos))
-		return charset_collations[pos];
+		return charset_collations[pos]->validate();
 
 	ERR_post(Arg::Gds(isc_text_subtype) << name.toQuotedString());
 }

src/jrd/met.epp

@@ -3881,6 +3881,9 @@ ScanResult CharSetVers::scan(thread_db* tdbb, ObjectBase::Flag flags)
 		END_FOR
 	}
 
+	if (flags & CacheFlag::MINISCAN)
+		return ScanResult::REPEAT;
+
 	FOR(REQUEST_HANDLE handle2)
 		CS IN RDB$CHARACTER_SETS
 			CROSS COL IN RDB$COLLATIONS OVER RDB$CHARACTER_SET_ID
@@ -3927,34 +3930,49 @@ ScanResult CharSetVers::scan(thread_db* tdbb, ObjectBase::Flag flags)
 			}
 		}
 
-		AutoPtr<texttype> tt = FB_NEW_POOL(perm->getPool()) texttype;
-		memset(tt, 0, sizeof(texttype));
-		INTL_lookup_texttype(tt, &info);
-
 		if (charset_collations.getCount() <= colId)
 			charset_collations.grow(colId + 1);
 
-		fb_assert((tt->texttype_canonical_width == 0 && tt->texttype_fn_canonical == NULL) ||
-				  (tt->texttype_canonical_width != 0 && tt->texttype_fn_canonical != NULL));
-
-		if (tt->texttype_canonical_width == 0)
+		try
 		{
-			if (charset->isMultiByte())
-				tt->texttype_canonical_width = sizeof(ULONG);	// UTF-32
-			else
+			AutoPtr<texttype> tt = FB_NEW_POOL(perm->getPool()) texttype;
+			memset(tt, 0, sizeof(texttype));
+			INTL_lookup_texttype(tt, &info);
+
+			fb_assert((tt->texttype_canonical_width == 0 && tt->texttype_fn_canonical == NULL) ||
+					  (tt->texttype_canonical_width != 0 && tt->texttype_fn_canonical != NULL));
+
+			if (tt->texttype_canonical_width == 0)
 			{
-				tt->texttype_canonical_width = charset->minBytesPerChar();
-				// canonical is equal to string, then TEXTTYPE_DIRECT_MATCH can be turned on
-				tt->texttype_flags |= TEXTTYPE_DIRECT_MATCH;
+				if (charset->isMultiByte())
+					tt->texttype_canonical_width = sizeof(ULONG);	// UTF-32
+				else
+				{
+					tt->texttype_canonical_width = charset->minBytesPerChar();
+					// canonical is equal to string, then TEXTTYPE_DIRECT_MATCH can be turned on
+					tt->texttype_flags |= TEXTTYPE_DIRECT_MATCH;
+				}
 			}
+
+			Collation* collation = Collation::createInstance(perm->getPool(),
+				TTypeId(id, colId), tt, nullptr, info.attributes, charset);
+			collation->name = info.collationName;
+
+			tt.release();
+			charset_collations[colId] = collation;
 		}
+		catch (const Exception& ex)
+		{
+			AutoDispose<IStatus> error = MasterInterfacePtr()->getStatus();
+			ex.stuffException(error);
 
-		Collation* collation = Collation::createInstance(perm->getPool(),
-			TTypeId(id, colId), tt, info.attributes, charset);
-		collation->name = info.collationName;
+			Collation* collation = Collation::createInstance(perm->getPool(),
+				TTypeId(id, colId), nullptr, error, info.attributes, charset);
+			collation->name = info.collationName;
 
-		tt.release();
-		charset_collations[colId] = collation;
+			error.release();
+			charset_collations[colId] = collation;
+		}
 	}
 	END_FOR