Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -435,16 +435,40 @@ private void CollectNestedSelections(
subgraph.Add(executionStep.SubgraphName);
}

backlog.Enqueue(
new BacklogItem(
parentSelection,
selectionSetPath,
declaringType,
leftovers,
preferBatching));
TryEnqueueBacklogItem(
backlog,
parentSelection,
selectionSetPath,
declaringType,
leftovers,
preferBatching
);
}
}

private static void TryEnqueueBacklogItem(Queue<BacklogItem> backlog, ISelection parentSelection, SelectionPath? selectionSetPath, ObjectTypeMetadata declaringType, List<ISelection> leftovers, bool preferBatching)
Comment thread
michaelstaib marked this conversation as resolved.
Outdated
{
foreach (var item in backlog)
{
if ((item.SelectionPath?.Equals(selectionSetPath) ?? selectionSetPath is null) &&
item.DeclaringTypeMetadata == declaringType &&
item.PreferBatching == preferBatching &&
item.Selections.Count == leftovers.Count &&
item.Selections.SequenceEqual(leftovers))
{
return;
}
}

backlog.Enqueue(
new BacklogItem(
parentSelection,
selectionSetPath,
declaringType,
leftovers,
preferBatching));
}

private static SelectionPath? CreateSelectionPath(SelectionPath? rootPath, List<ISelection> pathSegments)
{
var parent = rootPath;
Expand Down
65 changes: 65 additions & 0 deletions src/HotChocolate/Fusion/test/Core.Tests/RequestPlannerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2794,6 +2794,71 @@ type Query {
await snapshot.MatchMarkdownAsync();
}

[Fact]
public async Task Subgraph_Requested_On_Interface_Called_Only_Once()
{
// arrange
var subgraphA = await TestSubgraph.CreateAsync(
"""
schema {
query: Query
}

type Query {
books: [Book!]!
}

interface Book {
author: Author!
}

type FunnyBook implements Book {
author: Author!
}

type ScaryBook implements Book {
author: Author!
}

type Author {
id: Int!
}
"""
);

var subgraphB = await TestSubgraph.CreateAsync(
"""
schema {
query: Query
}

type Query {
authorById(id: [Int!]!): [Author!]!
}

type Author {
id: Int!
name: String!
}
"""
);

using var subgraphs = new TestSubgraphCollection(output, [subgraphA, subgraphB]);
var fusionGraph = await subgraphs.GetFusionGraphAsync();

// act
var result = await CreateQueryPlanAsync(
fusionGraph,
//"query { subgraph2Foo { name } }");
"query { books { author { name } } }");

// assert
var snapshot = new Snapshot();
snapshot.Add(result.UserRequest, nameof(result.UserRequest));
snapshot.Add(result.QueryPlan, nameof(result.QueryPlan));
await snapshot.MatchMarkdownAsync();
}

private static async Task<(DocumentNode UserRequest, Execution.Nodes.QueryPlan QueryPlan)> CreateQueryPlanAsync(
Skimmed.SchemaDefinition fusionGraph,
[StringSyntax("graphql")] string query)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# Subgraph_Requested_On_Interface_Called_Only_Once

## UserRequest

```graphql
{
books {
author {
name
}
}
}
```

## QueryPlan

```json
{
"document": "{ books { author { name } } }",
"rootNode": {
"type": "Sequence",
"nodes": [
{
"type": "Resolve",
"subgraph": "Subgraph_1",
"document": "query fetch_books_1 { books { __typename ... on ScaryBook { author { __fusion_exports__1: id } } ... on FunnyBook { author { __fusion_exports__1: id } } } }",
"selectionSetId": 0,
"provides": [
{
"variable": "__fusion_exports__1"
}
]
},
{
"type": "Compose",
"selectionSetIds": [
0
]
},
{
"type": "ResolveByKeyBatch",
"subgraph": "Subgraph_2",
"document": "query fetch_books_2($__fusion_exports__1: [Int!]!) { authorById(id: $__fusion_exports__1) { name __fusion_exports__1: id } }",
"selectionSetId": 3,
"path": [
"authorById"
],
"requires": [
{
"variable": "__fusion_exports__1"
}
]
},
{
"type": "Compose",
"selectionSetIds": [
3
]
}
]
},
"state": {
"__fusion_exports__1": "Author_id"
}
}
```