Avoid adding new dependencies to database too early

Author: AlexPeshkoff

src/dsql/ExprNodes.cpp

@@ -5122,7 +5122,7 @@ DmlNode* DefaultNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch*
 	{
 		Dependency dependency(obj_relation);
 		dependency.relation = MetadataCache::getPerm<Cached::Relation>(tdbb, relationName, CacheFlag::AUTOCREATE);
-		dependency.subName = FB_NEW_POOL(pool) MetaName(fieldName);
+		dependency.subName = fieldName;
 		csb->addDependency(dependency);
 	}
 
@@ -13299,7 +13299,7 @@ DmlNode* UdfCallNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch*
 			{
 				Dependency dependency(obj_udf);
 				dependency.function = node->function();
-				dependency.subName = &argName;
+				dependency.subName = argName;
 				csb->addDependency(dependency);
 			}
 		}

src/dsql/StmtNodes.cpp

@@ -3416,7 +3416,7 @@ DmlNode* ExecProcedureNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScr
 			{
 				Dependency dependency(obj_procedure);
 				dependency.procedure = node->procedure();
-				dependency.subName = &argName;
+				dependency.subName = argName;
 				csb->addDependency(dependency);
 			}
 		}
@@ -3427,7 +3427,7 @@ DmlNode* ExecProcedureNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScr
 			{
 				Dependency dependency(obj_procedure);
 				dependency.procedure = node->procedure();
-				dependency.subName = &argName;
+				dependency.subName = argName;
 				csb->addDependency(dependency);
 			}
 		}

src/jrd/RecordSourceNodes.cpp

@@ -1434,7 +1434,7 @@ ProcedureSourceNode* ProcedureSourceNode::parse(thread_db* tdbb, CompilerScratch
 				{
 					Dependency dependency(obj_procedure);
 					dependency.procedure = node->procedure();
-					dependency.subName = &argName;
+					dependency.subName = argName;
 					csb->addDependency(dependency);
 				}
 			}

src/jrd/dfw.epp

@@ -416,6 +416,7 @@ static bool set_linger(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool clear_cache(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool change_repl_state(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 static bool set_statistics(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
+static bool deps_to_disk(thread_db*, SSHORT, DeferredWork*, jrd_tra*);
 
 // ----------------------------------------------------------------
 
@@ -879,13 +880,13 @@ namespace
 							Dependency dependency(obj_relation);
 							dependency.relation = MetadataCache::getPerm<Cached::Relation>(tdbb,
 								parameter->prm_type_of_table, CacheFlag::AUTOCREATE);
-							dependency.subName = &parameter->prm_type_of_column;
+							dependency.subName = parameter->prm_type_of_column;
 							dependencies.push(dependency);
 						}
 						else if (!fb_utils::implicit_domain(parameter->prm_field_source.object.c_str()))
 						{
 							Dependency dependency(obj_field);
-							dependency.name = &parameter->prm_field_source;
+							dependency.name = parameter->prm_field_source;
 							dependencies.push(dependency);
 						}
 
@@ -899,8 +900,7 @@ namespace
 				}
 
 				MET_store_dependencies(tdbb, dependencies, nullptr, depName,
-					(work->dfw_package.isEmpty() ? objType : obj_package_header),
-					transaction);
+					(work->dfw_package.isEmpty() ? objType : obj_package_header));
 			}
 
 			MetadataCache::verify_cache(tdbb);
@@ -1121,6 +1121,7 @@ namespace
 
 static inline constexpr deferred_task task_table[] =
 {
+	{ dfw_deps_to_disk, deps_to_disk },			// must be first
 	{ dfw_add_shadow, add_shadow },
 	{ dfw_delete_ltt_index, delete_ltt_index },
 	{ dfw_delete_index, delete_index },
@@ -4998,3 +4999,32 @@ static bool make_ltt_version(thread_db* tdbb, SSHORT phase, DeferredWork* work,
 }
 
 
+// Store dependencies
+static bool deps_to_disk(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_tra* transaction)
+{
+	switch (phase)
+	{
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		case 5:
+		case 6:
+			return true;
+
+		case 7:
+			break;
+
+		default:
+			return false;
+	}
+
+	transaction->tra_flags |= TRA_deps_to_disk;
+
+	for (auto& dep : transaction->tra_dependencies)
+		MET_store_dependency(tdbb, dep.dependency, dep.dep_rel, dep.object_name, dep.dependency_type);
+
+	transaction->tra_dependencies.clear();
+
+	return false;
+}

src/jrd/exe.h

@@ -435,14 +435,26 @@ struct Dependency
 		Cached::Relation* relation;
 		Cached::Function* function;
 		Cached::Procedure* procedure;
-		const QualifiedName* name;
 		SLONG number;
 	};
+	QualifiedName name;
 
-	const MetaName* subName;
+	MetaName subName;
 	SLONG subNumber;
 };
 
+struct WildDependency
+{
+	WildDependency()
+		: dependency(0)
+	{ }
+
+	Dependency dependency;
+	const jrd_rel* dep_rel;
+	QualifiedName object_name;
+	int dependency_type;
+};
+
 class CompilerScratch : public pool_alloc<type_csb>
 {
 public: