Skip to content

[Fusion] Reduce forwarded-variable projection allocations #10584

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
tobias-tengler merged 1 commit into from
Oct 18, 2026
Merged

[Fusion] Reduce forwarded-variable projection allocations #10584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/HotChocolate/Fusion/src/Fusion.Execution/Execution/OperationPlanContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,7 @@ internal ImmutableArray<VariableValues> CreateVariableValueSets(
return [_resultStore.CreateVariableValueSets(ToResultPath(selectionSet), [])];
}

var variableValues = GetPathThroughVariables(forwardedVariables);
return [_resultStore.CreateVariableValueSets(CompactPath.Root, variableValues)];
return [_resultStore.CreateVariableValueSets(CompactPath.Root, Variables, forwardedVariables)];
}
else
{
Expand Down Expand Up @@ -442,8 +441,7 @@ internal ImmutableArray<VariableValues> CreateVariableValueSets(
return [];
}

var variableValues = GetPathThroughVariables(forwardedVariables);
return [_resultStore.CreateVariableValueSets(CompactPath.Root, variableValues)];
return [_resultStore.CreateVariableValueSets(CompactPath.Root, Variables, forwardedVariables)];
}
else
{
Expand Down
26 changes: 26 additions & 0 deletions src/HotChocolate/Fusion/src/Fusion.Execution/Execution/Results/FetchResultStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,6 +1877,32 @@ private void WriteValueNode(IValueNode value)
private void WriteCompositeResultValue(CompositeResultElement value)
=> value.WriteTo(_jsonWriter);

internal VariableValues CreateVariableValueSets(
CompactPath path,
IVariableValueCollection variables,
ReadOnlySpan<string> forwardedVariables)
{
_jsonWriter.Reset(_variableWriter);
var startPosition = _variableWriter.Position;
_jsonWriter.WriteStartObject();

if (!variables.IsEmpty)
{
foreach (var name in forwardedVariables)
{
if (variables.TryGetValue<IValueNode>(name, out var value))
{
_jsonWriter.WritePropertyName(name);
WriteValueNode(value);
}
}
}

_jsonWriter.WriteEndObject();
var length = _variableWriter.Position - startPosition;
return new VariableValues(path, JsonSegment.Create(_variableWriter, startPosition, length));
}

internal VariableValues CreateVariableValueSets(
CompactPath path,
IReadOnlyList<ObjectFieldNode> fields)
Expand Down
85 changes: 85 additions & 0 deletions ...hocolate/Fusion/test/Fusion.Execution.Tests/Execution/OperationPlanContextRoutingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,91 @@ namespace HotChocolate.Fusion.Execution;

public sealed class OperationPlanContextRoutingTests : FusionTestBase
{
[Theory]
[InlineData(false)]
[InlineData(true)]
public async Task CreateVariableValueSets_Should_PreserveForwardedValues_When_NoRequirements(bool multipleTargets)
{
// arrange
await using var fixture = await RoutingTestFixture.CreateAsync(
variables: new Dictionary<string, IValueNode>
{
["limit"] = new IntValueNode(10),
["nullable"] = HotChocolate.Language.NullValueNode.Default,
["input"] = new HotChocolate.Language.ObjectValueNode(
Field("name", new StringValueNode("quoted \"value\""))),
["unused"] = new StringValueNode("not forwarded")
});
var context = fixture.CreateContext();
string[] forwardedVariables = ["nullable", "missing", "input", "limit", "limit"];

// act
var result = multipleTargets
? context.CreateVariableValueSets([SelectionPath.Root], forwardedVariables, [])
: context.CreateVariableValueSets(SelectionPath.Root, forwardedVariables, []);

// assert
var entry = Assert.Single(result);
Assert.True(entry.Path.IsRoot);
Normalize(entry.Values).MatchInlineSnapshot(
"""
{"nullable":null,"input":{"name":"quoted \u0022value\u0022"},"limit":10,"limit":10}
""");
}

[Theory]
[InlineData(false, false)]
[InlineData(false, true)]
[InlineData(true, false)]
[InlineData(true, true)]
public async Task CreateVariableValueSets_Should_WriteEmptyObject_When_ForwardedVariablesAreAbsent(
bool multipleTargets,
bool emptyVariables)
{
// arrange
await using var fixture = await RoutingTestFixture.CreateAsync(
variables: emptyVariables
? null
: new Dictionary<string, IValueNode>
{
["unused"] = new IntValueNode(1)
});
var context = fixture.CreateContext();
string[] forwardedVariables = ["missing"];

// act
var result = multipleTargets
? context.CreateVariableValueSets([SelectionPath.Root], forwardedVariables, [])
: context.CreateVariableValueSets(SelectionPath.Root, forwardedVariables, []);

// assert
var entry = Assert.Single(result);
Normalize(entry.Values).MatchInlineSnapshot("{}");
}

[Theory]
[InlineData(false)]
[InlineData(true)]
public async Task CreateVariableValueSets_Should_ReturnNoVariables_When_NoRequirementsOrForwardedVariables(
bool multipleTargets)
{
// arrange
await using var fixture = await RoutingTestFixture.CreateAsync(
variables: new Dictionary<string, IValueNode>
{
["unused"] = new IntValueNode(1)
});
var context = fixture.CreateContext();

// act
var result = multipleTargets
? context.CreateVariableValueSets([SelectionPath.Root], [], [])
: context.CreateVariableValueSets(SelectionPath.Root, [], []);

// assert
Assert.True(result.IsDefaultOrEmpty);
}

[Fact]
public async Task CreateVariableValueSets_Should_RouteThroughResultStore_When_RequirementKeysIsNull()
{
Expand Down
Loading