Skip to content

Prevent concurrent fragment resolution from corrupting directive stacks #363

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
Bill Avery (wravery) merged 2 commits into from
Sep 15, 2026
+19 −3
Merged

Prevent concurrent fragment resolution from corrupting directive stacks #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
305518a
Initial plan
Copilot Sep 15, 2026
d9b6ec7
Isolate fragment directive stacks during async resolution
Copilot Sep 15, 2026
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
9 changes: 6 additions & 3 deletions src/GraphQLService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,9 +934,12 @@ SelectionVisitor::SelectionVisitor(const SelectionSetParams& selectionSetParams,
, _variables(variables)
, _typeNames(typeNames)
, _resolvers(resolvers)
, _fragmentDefinitionDirectives { selectionSetParams.fragmentDefinitionDirectives }
, _fragmentSpreadDirectives { selectionSetParams.fragmentSpreadDirectives }
, _inlineFragmentDirectives { selectionSetParams.inlineFragmentDirectives }
, _fragmentDefinitionDirectives { std::make_shared<FragmentDefinitionDirectiveStack>(
*selectionSetParams.fragmentDefinitionDirectives) }
, _fragmentSpreadDirectives { std::make_shared<FragmentSpreadDirectiveStack>(
*selectionSetParams.fragmentSpreadDirectives) }
, _inlineFragmentDirectives { std::make_shared<FragmentSpreadDirectiveStack>(
*selectionSetParams.inlineFragmentDirectives) }
{
static const Directives s_emptyFragmentDefinitionDirectives;

Expand Down
13 changes: 13 additions & 0 deletions test/CoroutineTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,9 @@ TEST_F(CoroutineCase, QueryEverythingThreaded)
auto query = R"(
query Everything {
appointments {
pageInfo {
...PageInfoFields
}
edges {
node {
id
Expand All @@ -298,6 +301,9 @@ TEST_F(CoroutineCase, QueryEverythingThreaded)
}
}
tasks {
pageInfo {
...PageInfoFields
}
edges {
node {
id
Expand All @@ -308,6 +314,9 @@ TEST_F(CoroutineCase, QueryEverythingThreaded)
}
}
unreadCounts {
pageInfo {
...PageInfoFields
}
edges {
node {
id
Expand All @@ -317,6 +326,10 @@ TEST_F(CoroutineCase, QueryEverythingThreaded)
}
}
}
}
fragment PageInfoFields on PageInfo {
hasNextPage
hasPreviousPage
})"_graphql;
response::Value variables(response::Type::Map);
auto state = std::make_shared<today::RequestState>(3);
Expand Down
Loading