Reset requirements planner for every iteration. (#7129)

Author: michaelstaib

src/HotChocolate/Core/src/Execution/Processing/SelectionSet.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+using HotChocolate.Types;
 
 namespace HotChocolate.Execution.Processing;
 
@@ -11,7 +14,7 @@ namespace HotChocolate.Execution.Processing;
 /// </summary>
 internal sealed class SelectionSet : ISelectionSet
 {
-    private static readonly Fragment[] _empty = Array.Empty<Fragment>();
+    private static readonly Fragment[] _empty = [];
     private readonly Selection[] _selections;
     private readonly Fragment[] _fragments;
     private Flags _flags;
@@ -100,4 +103,39 @@ private enum Flags
         Conditional = 1,
         Sealed = 2,
     }
+
+    public override string ToString()
+    {
+        // this produces the rough structure of the selection set for debugging purposes.
+        
+        var sb = new StringBuilder();
+
+        foreach (var selection in _selections)
+        {
+            if (selection.Type.IsLeafType())
+            {
+                if (selection.ResponseName.Equals(selection.Field.Name))
+                {
+                    sb.AppendLine(selection.ResponseName);
+                }
+                else
+                {
+                    sb.AppendLine($"{selection.ResponseName}: {selection.Field.Name}");
+                }
+            }
+            else
+            {
+                if (selection.ResponseName.Equals(selection.Field.Name))
+                {
+                    sb.AppendLine($"{selection.ResponseName} {{ ... }}");
+                }
+                else
+                {
+                    sb.AppendLine($"{selection.ResponseName}: {selection.Field.Name} {{{{ ... }}}}");
+                }
+            }
+        }
+
+        return sb.ToString();
+    }
 }

src/HotChocolate/Fusion/src/Core/Planning/Pipeline/RequirementsPlannerMiddleware.cs

@@ -33,6 +33,7 @@ private static void Plan(QueryPlanContext context)
                 continue;
             }
 
+            schemas.Clear();
             siblingsToRemove.Clear();
             roots.Clear();
 

src/HotChocolate/Fusion/src/Core/Planning/QueryPlanContext.cs

@@ -11,7 +11,8 @@ internal sealed class QueryPlanContext(IOperation operation)
 {
     private readonly Dictionary<ExecutionStep, QueryPlanNode> _stepToNode = new();
     private readonly Dictionary<QueryPlanNode, ExecutionStep> _nodeToStep = new();
-    private readonly Dictionary<object, SelectionExecutionStep> _selectionLookup = new();
+    private readonly Dictionary<ISelection, SelectionExecutionStep> _selectionLookup = new();
+    private readonly Dictionary<ISelectionSet, SelectionExecutionStep> _selectionSetLookup = new();
     private readonly HashSet<ISelectionSet> _selectionSets = [];
     private readonly HashSet<ExecutionStep> _completed = [];
     private readonly string _opName = operation.Name ?? CreateOperationName(operation);
@@ -111,26 +112,29 @@ public bool TryGetExecutionStep(
     {
         ArgumentNullException.ThrowIfNull(selectionSet);
 
-        return _selectionLookup.TryGetValue(selectionSet, out step);
+        return _selectionSetLookup.TryGetValue(selectionSet, out step);
     }
 
     public void ReBuildSelectionLookup()
     {
         _selectionLookup.Clear();
+        _selectionSetLookup.Clear();
 
         foreach (var executionStep in Steps)
         {
-            if (executionStep is SelectionExecutionStep ses)
+            if (executionStep is not SelectionExecutionStep selectionStep)
             {
-                foreach (var selection in ses.AllSelections)
-                {
-                    _selectionLookup.TryAdd(selection, ses);
-                }
-
-                foreach (var selectionSet in ses.AllSelectionSets)
-                {
-                    _selectionLookup.TryAdd(selectionSet, ses);
-                }
+                continue;
+            }
+
+            foreach (var selection in selectionStep.AllSelections)
+            {
+                _selectionLookup.TryAdd(selection, selectionStep);
+            }
+
+            foreach (var selectionSet in selectionStep.AllSelectionSets)
+            {
+                _selectionSetLookup.TryAdd(selectionSet, selectionStep);
             }
         }
     }

src/HotChocolate/Fusion/test/Core.Tests/DataTests.cs

@@ -57,7 +57,7 @@ query GetUser {
 
         // assert
         var snapshot = new Snapshot();
-        CollectSnapshotData(snapshot, request, result, fusionGraph);
+        CollectSnapshotData(snapshot, request, result);
         await snapshot.MatchMarkdownAsync();
 
         Assert.Null(result.ExpectQueryResult().Errors);