Add missing cache population for constants when restoring

Author: Artyom Abakumov

src/jrd/SystemTriggers.epp

@@ -1602,19 +1602,26 @@ void afterInsertRelation(thread_db* tdbb, Record* record)
 
 }
 
-void afterInsertProcedure(thread_db* tdbb, Record* record)
+template<class CachedType, USHORT Field, class IdType = MetaId>
+void afterInsertCachedObject(thread_db* tdbb, Record* record)
 {
-	if (tdbb->getAttachment()->isRWGbak())
-	{
-		dsc desc;
-		bool idSet = EVL_field(nullptr, record, f_prc_id, &desc);
-		fb_assert(idSet);
-		if (!idSet)
-			return;
+	if (!tdbb->getAttachment()->isRWGbak())
+		return;
 
-		MetaId id = MetaId(MOV_get_long(tdbb, &desc, 0));
-		MetadataCache::newVersion<Cached::Procedure>(tdbb, id);
-	}
+	dsc desc;
+	bool idSet = EVL_field(nullptr, record, Field, &desc);
+	fb_assert(idSet);
+	if (!idSet)
+		return;
+
+	const IdType id = IdType(MOV_get_long(tdbb, &desc, 0));
+	MetadataCache::newVersion<CachedType>(tdbb, id);
+}
+
+
+void afterInsertProcedure(thread_db* tdbb, Record* record)
+{
+	afterInsertCachedObject<Cached::Procedure, f_prc_id>(tdbb, record);
 }
 
 void afterUpdateProcedure(thread_db* tdbb, Record* orgRecord, Record* newRecord)
@@ -1624,19 +1631,10 @@ void afterUpdateProcedure(thread_db* tdbb, Record* orgRecord, Record* newRecord)
 
 void afterInsertFunction(thread_db* tdbb, Record* record)
 {
-	if (tdbb->getAttachment()->isRWGbak())
-	{
-		dsc desc;
-		bool idSet = EVL_field(nullptr, record, f_fun_id, &desc);
-		fb_assert(idSet);
-		if (!idSet)
-			return;
-
-		MetaId id = MetaId(MOV_get_long(tdbb, &desc, 0));
-		MetadataCache::newVersion<Cached::Function>(tdbb, id);
-	}
+	afterInsertCachedObject<Cached::Function, f_fun_id>(tdbb, record);
 }
 
+
 void afterUpdateFunction(thread_db* tdbb, Record* orgRecord, Record* newRecord)
 {
 	afterInsertFunction(tdbb, newRecord);
@@ -1705,17 +1703,12 @@ void beforeInsertCollation(thread_db* tdbb, Record* record, jrd_rel* relation)
 
 void afterInsertCollation(thread_db* tdbb, Record* record)
 {
-	if (tdbb->getAttachment()->isRWGbak())
-	{
-		dsc desc;
-		bool idSet = EVL_field(nullptr, record, f_coll_cs_id, &desc);
-		fb_assert(idSet);
-		if (!idSet)
-			return;
+	afterInsertCachedObject<Cached::CharSet, f_coll_cs_id, CSetId>(tdbb, record);
+}
 
-		CSetId csId = CSetId(MOV_get_long(tdbb, &desc, 0));
-		MetadataCache::newVersion<Cached::CharSet>(tdbb, csId);
-	}
+void afterInsertConstant(thread_db* tdbb, Record* record)
+{
+	afterInsertCachedObject<Cached::Constant, f_const_id>(tdbb, record);
 }
 
 }	// anonymous
@@ -1818,6 +1811,10 @@ void SystemTriggers::executeAfterInsertTriggers(thread_db* tdbb, jrd_rel* relati
 		case rel_funs:
 			afterInsertFunction(tdbb, record);
 			break;
+
+		case rel_constants:
+			afterInsertConstant(tdbb, record);
+			break;
 	}
 }
 

src/jrd/dfw.epp

@@ -490,6 +490,9 @@ static ISC_STATUS getErrorNotFound(int obj_type)
 	case obj_udf:
 		err_code = isc_dyn_func_not_found;
 		break;
+	case obj_package_constant:
+		err_code = isc_dyn_const_not_found;
+		break;
 	default:
 		fb_assert(false);
 	}