Skip to content

[Validation] Reset DocumentValidatorContext between rule invocations #9048

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 3 commits into from
Jan 18, 2026
+9 −4
Merged

[Validation] Reset DocumentValidatorContext between rule invocations #9048

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
68f626c
Reset DocumentValidatorContext between rule invocations
tobias-tengler Jan 18, 2026
f5a6cbc
Fix test matrix generation
tobias-tengler Jan 18, 2026
dea3b1f
Make sure every ValidationFeature properly resets its state
tobias-tengler Jan 18, 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
4 changes: 2 additions & 2 deletions .build/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static IReadOnlyCollection<Output> DotNetBuildSonarSolution(
var workingDirectory = Path.GetDirectoryName(solutionFile);
var list = new List<Output>();

list.AddRange(DotNetTasks.DotNet($"new sln -n {Path.GetFileNameWithoutExtension(solutionFile)}", workingDirectory));
list.AddRange(DotNetTasks.DotNet($"new sln -n {Path.GetFileNameWithoutExtension(solutionFile)} --format sln", workingDirectory));

var projectsArg = string.Join(" ", projects.Select(t => $"\"{t}\""));

Expand All @@ -99,7 +99,7 @@ public static IReadOnlyCollection<Output> DotNetBuildTestSolution(
var workingDirectory = Path.GetDirectoryName(solutionFile);
var list = new List<Output>();

list.AddRange(DotNetTasks.DotNet($"new sln -n {Path.GetFileNameWithoutExtension(solutionFile)}", workingDirectory));
list.AddRange(DotNetTasks.DotNet($"new sln -n {Path.GetFileNameWithoutExtension(solutionFile)} --format sln", workingDirectory));

var projectsArg = string.Join(" ", projects.Select(t => $"\"{t}\""));

Expand Down
3 changes: 2 additions & 1 deletion src/HotChocolate/Core/src/Validation/DocumentValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ public DocumentValidatorResult Validate(
break;
}

context.Reset();

start = ref Unsafe.Add(ref start, 1)!;
}

Expand Down Expand Up @@ -156,7 +158,6 @@ private DocumentValidatorContext RentContext(

private void ReturnContext(DocumentValidatorContext context)
{
context.Clear();
_contextPool.Return(context);
}
}
1 change: 1 addition & 0 deletions src/HotChocolate/Core/src/Validation/Rules/FieldVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@ protected internal override void Reset()
s_fieldInfoPool.Return(_buffers[i]);
}

_buffers.Clear();
_buffers.Push(buffer);
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/HotChocolate/Core/src/Validation/Rules/ValueVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ protected override ISyntaxVisitorAction Enter(
ObjectValueNode node,
DocumentValidatorContext context)
{
var inputFieldNames = context.Features.GetOrSet<ValueVisitorFeature>().InputFieldNames;
var inputFieldNames = context.Features.GetRequired<ValueVisitorFeature>().InputFieldNames;
inputFieldNames.Clear();

for (var i = 0; i < node.Fields.Count; i++)
Expand Down
3 changes: 3 additions & 0 deletions src/HotChocolate/CostAnalysis/src/CostAnalysis/CostAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,8 @@ protected internal override void Reset()
{
NonNullString = null!;
FieldSets.Clear();
SelectionSetCost.Clear();
Processed.Clear();

if (_buffers.Count > 1)
{
Expand All @@ -379,6 +381,7 @@ protected internal override void Reset()
s_fieldInfoPool.Return(_buffers[i]);
}

_buffers.Clear();
_buffers.Push(buffer);
}
else
Expand Down
Loading