Skip to content

Commit 5ec371d

Browse files
committed
Make operation validation and fragment traversal iterative
1 parent 96443c2 commit 5ec371d

27 files changed

Lines changed: 594 additions & 364 deletions

‎src/jmh/java/benchmark/GoodFaithValidationBenchmark.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@Measurement(iterations = 8, time = 1)
3333
@Fork(2)
3434
public class GoodFaithValidationBenchmark {
35-
@Param({"tiny", "minimal", "simple", "fragments", "wideScalars", "wide", "wideLarge", "fragmentHeavy", "deep", "multiOperation", "mixedAbstract", "introspection"})
35+
@Param({"tiny", "minimal", "simple", "fragments", "wideScalars", "wide", "wideLarge", "fragmentHeavy", "deep", "multiOperation", "mixedAbstract", "introspection", "fragmentChain"})
3636
public String scenario;
3737

3838
private GraphQLSchema schema;
@@ -79,6 +79,8 @@ private String query() {
7979
case "mixedAbstract":
8080
return repeatedFields(200, "node { name child { name } "
8181
+ "... on A { name child { name extraA } } ... on B { name child { name extraB } } }");
82+
case "fragmentChain":
83+
return fragmentChain();
8284
case "introspection":
8385
return IntrospectionQuery.INTROSPECTION_QUERY;
8486
default:
@@ -107,6 +109,14 @@ private String fragments() {
107109
return "fragment F on Node { name child { ...G } } fragment G on Node { name }";
108110
}
109111

112+
private String fragmentChain() {
113+
StringBuilder query = new StringBuilder("{ node { ...F0 } }");
114+
for (int index = 0; index < 1500; index++) {
115+
query.append("fragment F").append(index).append(" on Node { ...F").append(index + 1).append(" } ");
116+
}
117+
return query.append("fragment F1500 on Node { name }").toString();
118+
}
119+
110120
@Benchmark
111121
public List<ValidationError> validate() {
112122
return new Validator().validateDocument(schema, document, Locale.ENGLISH);

‎src/jmh/java/benchmark/OverlappingFieldValidationBenchmark.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import graphql.parser.Parser;
88
import graphql.schema.GraphQLSchema;
99
import graphql.schema.idl.SchemaGenerator;
10-
import graphql.validation.LanguageTraversal;
1110
import graphql.validation.OperationValidationRule;
1211
import graphql.validation.OperationValidator;
1312
import graphql.validation.ValidationContext;
@@ -79,8 +78,8 @@ private List<ValidationError> validateQuery(GraphQLSchema schema, Document docum
7978
ValidationContext validationContext = new ValidationContext(schema, document, i18n);
8079
OperationValidator operationValidator = new OperationValidator(validationContext, errorCollector,
8180
rule -> rule == OperationValidationRule.OVERLAPPING_FIELDS_CAN_BE_MERGED);
82-
LanguageTraversal languageTraversal = new LanguageTraversal();
83-
languageTraversal.traverse(document, operationValidator);
81+
82+
operationValidator.validate();
8483
return errorCollector.getErrors();
8584
}
8685
}

‎src/jmh/java/performance/OverlappingFieldValidationPerformance.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import graphql.parser.Parser;
99
import graphql.schema.GraphQLSchema;
1010
import graphql.schema.idl.SchemaGenerator;
11-
import graphql.validation.LanguageTraversal;
1211
import graphql.validation.OperationValidationRule;
1312
import graphql.validation.OperationValidator;
1413
import graphql.validation.ValidationContext;
@@ -152,8 +151,8 @@ private List<ValidationError> validateQuery(GraphQLSchema schema, Document docum
152151
ValidationContext validationContext = new ValidationContext(schema, document, i18n);
153152
OperationValidator operationValidator = new OperationValidator(validationContext, errorCollector,
154153
rule -> rule == OperationValidationRule.OVERLAPPING_FIELDS_CAN_BE_MERGED);
155-
LanguageTraversal languageTraversal = new LanguageTraversal();
156-
languageTraversal.traverse(document, operationValidator);
154+
155+
operationValidator.validate();
157156
Assert.assertTrue(errorCollector.getErrors().size() == 0);
158157
return errorCollector.getErrors();
159158
}

‎src/main/java/graphql/execution/FieldCollector.java‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
import graphql.schema.GraphQLObjectType;
1616
import graphql.schema.GraphQLType;
1717
import graphql.schema.GraphQLUnionType;
18+
import graphql.util.SelectionSetTraversalFrame;
1819

20+
import java.util.ArrayDeque;
21+
import java.util.Deque;
1922
import java.util.LinkedHashMap;
2023
import java.util.LinkedHashSet;
2124
import java.util.List;
@@ -70,19 +73,32 @@ public MergedSelectionSet collectFields(FieldCollectorParameters parameters, Sel
7073

7174

7275
private void collectFields(FieldCollectorParameters parameters, SelectionSet selectionSet, Set<String> visitedFragments, Map<String, MergedField> fields, DeferredExecution deferredExecution, boolean incrementalSupport) {
73-
74-
for (Selection selection : selectionSet.getSelections()) {
75-
if (selection instanceof Field) {
76-
collectField(parameters, fields, (Field) selection, deferredExecution);
77-
} else if (selection instanceof InlineFragment) {
78-
collectInlineFragment(parameters, visitedFragments, fields, (InlineFragment) selection, incrementalSupport);
79-
} else if (selection instanceof FragmentSpread) {
80-
collectFragmentSpread(parameters, visitedFragments, fields, (FragmentSpread) selection, incrementalSupport);
76+
Deque<SelectionSetTraversalFrame<DeferredExecution>> frames = new ArrayDeque<>();
77+
frames.push(new SelectionSetTraversalFrame<>(selectionSet, deferredExecution));
78+
while (!frames.isEmpty()) {
79+
SelectionSetTraversalFrame<DeferredExecution> frame = frames.getFirst();
80+
Selection selection = frame.nextSelection();
81+
if (selection == null) {
82+
frames.pop();
83+
continue;
8184
}
85+
collectSelection(parameters, visitedFragments, fields, frames, frame.getContext(), selection, incrementalSupport);
86+
}
87+
}
88+
89+
private void collectSelection(FieldCollectorParameters parameters, Set<String> visitedFragments, Map<String, MergedField> fields,
90+
Deque<SelectionSetTraversalFrame<DeferredExecution>> frames, DeferredExecution deferredExecution,
91+
Selection selection, boolean incrementalSupport) {
92+
if (selection instanceof Field) {
93+
collectField(parameters, fields, (Field) selection, deferredExecution);
94+
} else if (selection instanceof InlineFragment) {
95+
collectInlineFragment(parameters, frames, (InlineFragment) selection, incrementalSupport);
96+
} else if (selection instanceof FragmentSpread) {
97+
collectFragmentSpread(parameters, visitedFragments, frames, (FragmentSpread) selection, incrementalSupport);
8298
}
8399
}
84100

85-
private void collectFragmentSpread(FieldCollectorParameters parameters, Set<String> visitedFragments, Map<String, MergedField> fields, FragmentSpread fragmentSpread, boolean incrementalSupport) {
101+
private void collectFragmentSpread(FieldCollectorParameters parameters, Set<String> visitedFragments, Deque<SelectionSetTraversalFrame<DeferredExecution>> frames, FragmentSpread fragmentSpread, boolean incrementalSupport) {
86102
if (visitedFragments.contains(fragmentSpread.getName())) {
87103
return;
88104
}
@@ -111,10 +127,10 @@ private void collectFragmentSpread(FieldCollectorParameters parameters, Set<Stri
111127
DeferredExecution::new
112128
) : null;
113129

114-
collectFields(parameters, fragmentDefinition.getSelectionSet(), visitedFragments, fields, deferredExecution, incrementalSupport);
130+
frames.push(new SelectionSetTraversalFrame<>(fragmentDefinition.getSelectionSet(), deferredExecution));
115131
}
116132

117-
private void collectInlineFragment(FieldCollectorParameters parameters, Set<String> visitedFragments, Map<String, MergedField> fields, InlineFragment inlineFragment, boolean incrementalSupport) {
133+
private void collectInlineFragment(FieldCollectorParameters parameters, Deque<SelectionSetTraversalFrame<DeferredExecution>> frames, InlineFragment inlineFragment, boolean incrementalSupport) {
118134
if (!conditionalNodes.shouldInclude(inlineFragment,
119135
parameters.getVariables(),
120136
parameters.getGraphQLSchema(),
@@ -129,7 +145,7 @@ private void collectInlineFragment(FieldCollectorParameters parameters, Set<Stri
129145
DeferredExecution::new
130146
) : null;
131147

132-
collectFields(parameters, inlineFragment.getSelectionSet(), visitedFragments, fields, deferredExecution, incrementalSupport);
148+
frames.push(new SelectionSetTraversalFrame<>(inlineFragment.getSelectionSet(), deferredExecution));
133149
}
134150

135151
private void collectField(FieldCollectorParameters parameters, Map<String, MergedField> fields, Field field, DeferredExecution deferredExecution) {
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package graphql.util;
2+
3+
import graphql.Internal;
4+
import graphql.language.Selection;
5+
import graphql.language.SelectionSet;
6+
import org.jspecify.annotations.NullMarked;
7+
import org.jspecify.annotations.Nullable;
8+
9+
import java.util.List;
10+
11+
@Internal
12+
@NullMarked
13+
public final class SelectionSetTraversalFrame<T> {
14+
private final List<Selection> selections;
15+
private final @Nullable T context;
16+
private int nextSelection;
17+
18+
public SelectionSetTraversalFrame(SelectionSet selectionSet, @Nullable T context) {
19+
this.selections = selectionSet.getSelections();
20+
this.context = context;
21+
}
22+
23+
public @Nullable Selection<?> nextSelection() {
24+
if (nextSelection == selections.size()) {
25+
return null;
26+
}
27+
return selections.get(nextSelection++);
28+
}
29+
30+
public @Nullable T getContext() {
31+
return context;
32+
}
33+
}

‎src/main/java/graphql/validation/DocumentVisitor.java‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/main/java/graphql/validation/LanguageTraversal.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
package graphql.validation;
2+
3+
import graphql.Internal;
4+
import graphql.language.FragmentDefinition;
5+
import graphql.language.Node;
6+
import org.jspecify.annotations.NullMarked;
7+
import org.jspecify.annotations.Nullable;
8+
9+
import java.util.List;
10+
11+
import static graphql.Assert.assertNotNull;
12+
13+
@Internal
14+
@NullMarked
15+
public final class OperationValidationFrame {
16+
private final Node<?> node;
17+
private final boolean fragmentExpansion;
18+
private final int fieldCountBefore;
19+
private final int depthAtEntry;
20+
private final int previousFragmentMaxDepth;
21+
private boolean entered;
22+
private boolean childrenStarted;
23+
private @Nullable List<Node> children;
24+
private int nextChild;
25+
26+
public OperationValidationFrame(Node<?> node) {
27+
this(node, false, 0, 0, 0);
28+
}
29+
30+
public OperationValidationFrame(Node<?> node, List<Node> children) {
31+
this(node);
32+
this.entered = true;
33+
this.children = children;
34+
}
35+
36+
public OperationValidationFrame(FragmentDefinition fragment, int fieldCountBefore, int depthAtEntry, int previousFragmentMaxDepth) {
37+
this(fragment, true, fieldCountBefore, depthAtEntry, previousFragmentMaxDepth);
38+
}
39+
40+
private OperationValidationFrame(Node<?> node, boolean fragmentExpansion, int fieldCountBefore, int depthAtEntry, int previousFragmentMaxDepth) {
41+
this.node = node;
42+
this.fragmentExpansion = fragmentExpansion;
43+
this.fieldCountBefore = fieldCountBefore;
44+
this.depthAtEntry = depthAtEntry;
45+
this.previousFragmentMaxDepth = previousFragmentMaxDepth;
46+
}
47+
48+
public Node<?> getNode() {
49+
return node;
50+
}
51+
52+
public boolean enter() {
53+
if (entered) {
54+
return false;
55+
}
56+
entered = true;
57+
return true;
58+
}
59+
60+
public boolean startChildren() {
61+
if (childrenStarted) {
62+
return false;
63+
}
64+
childrenStarted = true;
65+
if (children == null) {
66+
children = node.getChildren();
67+
}
68+
return true;
69+
}
70+
71+
public @Nullable Node<?> nextChild() {
72+
List<Node> nodes = assertNotNull(children);
73+
while (nextChild < nodes.size()) {
74+
Node<?> child = nodes.get(nextChild++);
75+
if (child != null) {
76+
return child;
77+
}
78+
}
79+
return null;
80+
}
81+
82+
public boolean isFragmentExpansion() {
83+
return fragmentExpansion;
84+
}
85+
86+
public int getFieldCountBefore() {
87+
return fieldCountBefore;
88+
}
89+
90+
public int getDepthAtEntry() {
91+
return depthAtEntry;
92+
}
93+
94+
public int getPreviousFragmentMaxDepth() {
95+
return previousFragmentMaxDepth;
96+
}
97+
}

0 commit comments

Comments
 (0)