Skip to content

fix(federation): fixed the is_descendant_of function #5768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
duckki merged 2 commits into from
Aug 5, 2024
Merged

fix(federation): fixed the is_descendant_of function #5768

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29929da
fix(federation): fixed a bug in the `is_descendant_of` function
duckki Aug 4, 2024
0bf2ee3
changed the assertion in add_parent function to be stronger
duckki Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions apollo-federation/src/query_plan/fetch_dependency_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@ impl FetchDependencyGraph {

/// Adds another node as a parent of `child`,
/// meaning that this fetch should happen after the provided one.
/// Assumption: The parent node is not a descendant of the child.
fn add_parent(&mut self, child_id: NodeIndex, parent_relation: ParentRelation) {
let ParentRelation {
parent_node_id,
Expand All @@ -738,8 +739,8 @@ impl FetchDependencyGraph {
return;
}
assert!(
!self.graph.contains_edge(child_id, parent_node_id),
"Node {parent_node_id:?} is a child of {child_id:?}: \
!self.is_descendant_of(parent_node_id, child_id),
"Node {parent_node_id:?} is a descendant of {child_id:?}: \
adding it as parent would create a cycle"
);
self.on_modification();
Expand Down Expand Up @@ -794,15 +795,7 @@ impl FetchDependencyGraph {
}

fn is_descendant_of(&self, node_id: NodeIndex, maybe_ancestor_id: NodeIndex) -> bool {
if node_id == maybe_ancestor_id {
return true;
}
for child_id in self.children_of(node_id) {
if self.is_descendant_of(child_id, maybe_ancestor_id) {
return true;
}
}
false
petgraph::algo::has_path_connecting(&self.graph, maybe_ancestor_id, node_id, None)
}

/// Returns whether `node_id` is both a child of `maybe_parent_id` but also if we can show that the
Expand Down