Skip to content

Add plan-bounded resets for Fusion execution contexts #10114

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
michaelstaib merged 3 commits into from
Jul 17, 2026
Merged

Add plan-bounded resets for Fusion execution contexts #10114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fe4d4a
Add plan-bounded resets for Fusion execution contexts
michaelstaib Jul 14, 2026
35f8841
polish
michaelstaib Jul 16, 2026
6e7ba75
Merge branch 'main' into mst/plan-bounded-reset
michaelstaib Jul 16, 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
30 changes: 28 additions & 2 deletions src/HotChocolate/Fusion/src/Fusion.Execution/Execution/Nodes/IncrementalPlan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ public IncrementalPlan(
AllNodes = allNodes;
DeliveryGroups = deliveryGroups;
Requirements = requirements.IsDefault ? [] : requirements;
_nodesById = CreateNodeLookup(allNodes);
_nodesById = CreateNodeLookup(
allNodes,
out var usesDynamicSchemaNames,
out var usesBatchNodes);
UsesDynamicSchemaNames = usesDynamicSchemaNames;
UsesBatchNodes = usesBatchNodes;
}

/// <summary>
Expand Down Expand Up @@ -92,6 +97,10 @@ public IncrementalPlan(
/// </summary>
public int MaxNodeId => _nodesById.Length > 0 ? _nodesById.Length - 1 : 0;

internal bool UsesDynamicSchemaNames { get; }

internal bool UsesBatchNodes { get; }

/// <summary>
/// Gets the child incremental plans for this plan. Incremental plans do not
/// contain child plan objects; the root <see cref="OperationPlan"/> exposes
Expand Down Expand Up @@ -142,8 +151,14 @@ public ExecutionNode GetExecutionNode(IOperationPlanNode planNode)
throw ThrowHelper.NodeNotFound(planNode.Id);
}

private static ExecutionNode?[] CreateNodeLookup(ImmutableArray<ExecutionNode> allNodes)
private static ExecutionNode?[] CreateNodeLookup(
ImmutableArray<ExecutionNode> allNodes,
out bool usesDynamicSchemaNames,
out bool usesBatchNodes)
{
usesDynamicSchemaNames = false;
usesBatchNodes = false;

if (allNodes.IsDefaultOrEmpty)
{
return [];
Expand All @@ -155,6 +170,17 @@ public ExecutionNode GetExecutionNode(IOperationPlanNode planNode)
{
maxId = Math.Max(maxId, node.Id);

switch (node.Type)
{
case ExecutionNodeType.Node:
usesDynamicSchemaNames = true;
break;

case ExecutionNodeType.OperationBatch:
usesBatchNodes = true;
break;
}

if (node is OperationBatchExecutionNode batchNode)
{
foreach (var op in batchNode.Operations)
Expand Down
30 changes: 28 additions & 2 deletions src/HotChocolate/Fusion/src/Fusion.Execution/Execution/Nodes/OperationPlan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,13 @@ private OperationPlan(
ExpandedNodes = expandedNodes;
DeliveryGroups = deliveryGroups;
IncrementalPlans = incrementalPlans;
_nodesById = CreateNodeLookup(allNodes);
_nodesById = CreateNodeLookup(
allNodes,
out var usesDynamicSchemaNames,
out var usesBatchNodes);
MaxNodeId = _nodesById.Length > 0 ? _nodesById.Length - 1 : 0;
UsesDynamicSchemaNames = usesDynamicSchemaNames;
UsesBatchNodes = usesBatchNodes;
}

/// <summary>
Expand Down Expand Up @@ -100,6 +105,10 @@ public IReadOnlyList<VariableDefinitionNode> VariableDefinitions
/// </summary>
public int MaxNodeId { get; }

internal bool UsesDynamicSchemaNames { get; }

internal bool UsesBatchNodes { get; }

/// <summary>
/// Retrieves the execution node associated with a plan node identifier.
/// </summary>
Expand Down Expand Up @@ -245,8 +254,14 @@ public static OperationPlan Create(
expandedNodes);
}

private static ExecutionNode?[] CreateNodeLookup(ImmutableArray<ExecutionNode> allNodes)
private static ExecutionNode?[] CreateNodeLookup(
ImmutableArray<ExecutionNode> allNodes,
out bool usesDynamicSchemaNames,
out bool usesBatchNodes)
{
usesDynamicSchemaNames = false;
usesBatchNodes = false;

if (allNodes.IsDefaultOrEmpty)
{
return [];
Expand All @@ -258,6 +273,17 @@ public static OperationPlan Create(
{
maxId = Math.Max(maxId, node.Id);

switch (node.Type)
{
case ExecutionNodeType.Node:
usesDynamicSchemaNames = true;
break;

case ExecutionNodeType.OperationBatch:
usesBatchNodes = true;
break;
}

if (node is OperationBatchExecutionNode batchNode)
{
foreach (var op in batchNode.Operations)
Expand Down
57 changes: 47 additions & 10 deletions src/HotChocolate/Fusion/src/Fusion.Execution/Execution/OperationPlanContext.Pooling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ internal void Initialize(
CancellationTokenSource cancellationTokenSource,
MemoryArena? memory = null)
{
_activeNodeSlotCount = 0;
_usesDynamicSchemaNames = true;
_usesBatchNodes = true;

ArgumentNullException.ThrowIfNull(requestContext);
ArgumentNullException.ThrowIfNull(variables);
ArgumentNullException.ThrowIfNull(operationPlan);
Expand All @@ -49,6 +53,20 @@ internal void Initialize(

Variables = variables;
OperationPlan = operationPlan;

switch (operationPlan)
{
case OperationPlan plan:
_usesDynamicSchemaNames = plan.UsesDynamicSchemaNames;
_usesBatchNodes = plan.UsesBatchNodes;
break;

case IncrementalPlan plan:
_usesDynamicSchemaNames = plan.UsesDynamicSchemaNames;
_usesBatchNodes = plan.UsesBatchNodes;
break;
}

IncludeFlags = operationPlan.Operation.CreateIncludeFlags(variables);
DeferFlags = operationPlan.Operation.CreateDeferFlags(variables);
_collectTelemetry = requestContext.CollectOperationPlanTelemetry();
Expand All @@ -67,7 +85,9 @@ internal void Initialize(

_executionState.Initialize(_collectTelemetry, cancellationTokenSource);

EnsureNodeArrayCapacity(operationPlan.MaxNodeId);
var maxNodeId = operationPlan.MaxNodeId;
EnsureNodeArrayCapacity(maxNodeId);
_activeNodeSlotCount = maxNodeId + 1;
}

/// <summary>
Expand Down Expand Up @@ -106,19 +126,36 @@ internal void ReturnEngineCancellation()
/// </summary>
internal void Clean()
{
DisposeNodeState();
var activeNodeSlotCount = _activeNodeSlotCount;

if (_nodeSlotCapacity > 0)
if (activeNodeSlotCount > 0)
{
Array.Clear(_nodesToComplete, 0, _nodeSlotCapacity);
Array.Clear(_schemaNames, 0, _nodeSlotCapacity);
Array.Clear(_skippedDefinitions, 0, _nodeSlotCapacity);
Array.Clear(_batchRequestErrors, 0, _nodeSlotCapacity);
Array.Clear(_variableValueSets, 0, _nodeSlotCapacity);
Array.Clear(_transportUris, 0, _nodeSlotCapacity);
Array.Clear(_transportContentTypes, 0, _nodeSlotCapacity);
DisposeNodeState(activeNodeSlotCount);
Array.Clear(_nodesToComplete, 0, activeNodeSlotCount);

if (_usesDynamicSchemaNames)
{
Array.Clear(_schemaNames, 0, activeNodeSlotCount);
}

if (_usesBatchNodes)
{
Array.Clear(_skippedDefinitions, 0, activeNodeSlotCount);
Array.Clear(_batchRequestErrors, 0, activeNodeSlotCount);
}

if (_collectTelemetry)
{
Array.Clear(_variableValueSets, 0, activeNodeSlotCount);
Array.Clear(_transportUris, 0, activeNodeSlotCount);
Array.Clear(_transportContentTypes, 0, activeNodeSlotCount);
}
}

_activeNodeSlotCount = 0;
_usesDynamicSchemaNames = true;
_usesBatchNodes = true;

_resultStore.Clean(256, 256);
_executionState.Clean();

Expand Down
34 changes: 23 additions & 11 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 @@ -42,13 +42,16 @@ public sealed partial class OperationPlanContext : IFeatureProvider, IAsyncDispo
private readonly INodeIdParser _nodeIdParser;
private readonly IErrorHandler _errorHandler;
private bool _collectTelemetry;
private bool _usesDynamicSchemaNames;
private bool _usesBatchNodes;
#pragma warning disable IDE0370 // Remove unnecessary suppression
private ISourceSchemaClientScope _clientScope = default!;
#pragma warning restore IDE0370 // Remove unnecessary suppression
private string? _traceId;
private long _start;
private long _clientScopeCreatedAt;
private int _disposed;
private int _activeNodeSlotCount;
private int _nodeSlotCapacity;
private MemoryArena? _memory;
private readonly FixedMemoryArenaSource _memorySource = new();
Expand Down Expand Up @@ -890,28 +893,37 @@ public bool TryParseTypeNameFromId(string id, [NotNullWhen(true)] out string? ty

private void ResetNodeState()
{
Array.Clear(_schemaNames);
Array.Clear(_skippedDefinitions);
Array.Clear(_batchRequestErrors);
var activeNodeSlotCount = _activeNodeSlotCount;

if (_usesDynamicSchemaNames)
{
Array.Clear(_schemaNames, 0, activeNodeSlotCount);
}

if (_usesBatchNodes)
{
Array.Clear(_skippedDefinitions, 0, activeNodeSlotCount);
Array.Clear(_batchRequestErrors, 0, activeNodeSlotCount);
}

if (_collectTelemetry)
{
Array.Clear(_variableValueSets);
Array.Clear(_transportUris);
Array.Clear(_transportContentTypes);
Array.Clear(_variableValueSets, 0, activeNodeSlotCount);
Array.Clear(_transportUris, 0, activeNodeSlotCount);
Array.Clear(_transportContentTypes, 0, activeNodeSlotCount);
}

foreach (var nodeCompletionSet in _nodesToComplete)
for (var i = 0; i < activeNodeSlotCount; i++)
{
nodeCompletionSet?.Reset();
_nodesToComplete[i]?.Reset();
}
}

private void DisposeNodeState()
private void DisposeNodeState(int activeNodeSlotCount)
{
foreach (var nodeCompletionSet in _nodesToComplete)
for (var i = 0; i < activeNodeSlotCount; i++)
{
nodeCompletionSet?.Dispose();
_nodesToComplete[i]?.Dispose();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/HotChocolate/Fusion/src/Fusion.Execution/Execution/Results/FetchResultStore.Pooling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ internal void Clean(int maxCollectTargetRetainLength, int maxDictionaryRetainCap
}

// return path segments to global pool and reset local pool
_pathPool.Dispose();
_pathPool?.Dispose();
_pathPool = null!;

// clear errors
Expand Down
Loading
Loading