Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/jmh/java/benchmark/GoodFaithValidationBenchmark.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
@Measurement(iterations = 8, time = 1)
@Fork(2)
public class GoodFaithValidationBenchmark {
@Param({"tiny", "minimal", "simple", "fragments", "wideScalars", "wide", "wideLarge", "fragmentHeavy", "deep", "multiOperation", "mixedAbstract", "introspection"})
@Param({"tiny", "minimal", "simple", "fragments", "wideScalars", "wide", "wideLarge", "fragmentHeavy", "deep", "multiOperation", "mixedAbstract", "introspection", "fragmentChain"})
public String scenario;

private GraphQLSchema schema;
Expand Down Expand Up @@ -79,6 +79,8 @@ private String query() {
case "mixedAbstract":
return repeatedFields(200, "node { name child { name } "
+ "... on A { name child { name extraA } } ... on B { name child { name extraB } } }");
case "fragmentChain":
return fragmentChain();
case "introspection":
return IntrospectionQuery.INTROSPECTION_QUERY;
default:
Expand Down Expand Up @@ -107,6 +109,14 @@ private String fragments() {
return "fragment F on Node { name child { ...G } } fragment G on Node { name }";
}

private String fragmentChain() {
StringBuilder query = new StringBuilder("{ node { ...F0 } }");
for (int index = 0; index < 1500; index++) {
query.append("fragment F").append(index).append(" on Node { ...F").append(index + 1).append(" } ");
}
return query.append("fragment F1500 on Node { name }").toString();
}

@Benchmark
public List<ValidationError> validate() {
return new Validator().validateDocument(schema, document, Locale.ENGLISH);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import graphql.parser.Parser;
import graphql.schema.GraphQLSchema;
import graphql.schema.idl.SchemaGenerator;
import graphql.validation.LanguageTraversal;
import graphql.validation.OperationValidationRule;
import graphql.validation.OperationValidator;
import graphql.validation.ValidationContext;
Expand Down Expand Up @@ -79,8 +78,8 @@ private List<ValidationError> validateQuery(GraphQLSchema schema, Document docum
ValidationContext validationContext = new ValidationContext(schema, document, i18n);
OperationValidator operationValidator = new OperationValidator(validationContext, errorCollector,
rule -> rule == OperationValidationRule.OVERLAPPING_FIELDS_CAN_BE_MERGED);
LanguageTraversal languageTraversal = new LanguageTraversal();
languageTraversal.traverse(document, operationValidator);

operationValidator.validate();
return errorCollector.getErrors();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import graphql.parser.Parser;
import graphql.schema.GraphQLSchema;
import graphql.schema.idl.SchemaGenerator;
import graphql.validation.LanguageTraversal;
import graphql.validation.OperationValidationRule;
import graphql.validation.OperationValidator;
import graphql.validation.ValidationContext;
Expand Down Expand Up @@ -152,8 +151,8 @@ private List<ValidationError> validateQuery(GraphQLSchema schema, Document docum
ValidationContext validationContext = new ValidationContext(schema, document, i18n);
OperationValidator operationValidator = new OperationValidator(validationContext, errorCollector,
rule -> rule == OperationValidationRule.OVERLAPPING_FIELDS_CAN_BE_MERGED);
LanguageTraversal languageTraversal = new LanguageTraversal();
languageTraversal.traverse(document, operationValidator);

operationValidator.validate();
Assert.assertTrue(errorCollector.getErrors().size() == 0);
return errorCollector.getErrors();
}
Expand Down
40 changes: 28 additions & 12 deletions src/main/java/graphql/execution/FieldCollector.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLType;
import graphql.schema.GraphQLUnionType;
import graphql.util.SelectionSetTraversalFrame;

import java.util.ArrayDeque;
import java.util.Deque;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
Expand Down Expand Up @@ -70,19 +73,32 @@ public MergedSelectionSet collectFields(FieldCollectorParameters parameters, Sel


private void collectFields(FieldCollectorParameters parameters, SelectionSet selectionSet, Set<String> visitedFragments, Map<String, MergedField> fields, DeferredExecution deferredExecution, boolean incrementalSupport) {

for (Selection selection : selectionSet.getSelections()) {
if (selection instanceof Field) {
collectField(parameters, fields, (Field) selection, deferredExecution);
} else if (selection instanceof InlineFragment) {
collectInlineFragment(parameters, visitedFragments, fields, (InlineFragment) selection, incrementalSupport);
} else if (selection instanceof FragmentSpread) {
collectFragmentSpread(parameters, visitedFragments, fields, (FragmentSpread) selection, incrementalSupport);
Deque<SelectionSetTraversalFrame<DeferredExecution>> frames = new ArrayDeque<>();
frames.push(new SelectionSetTraversalFrame<>(selectionSet, deferredExecution));
while (!frames.isEmpty()) {
SelectionSetTraversalFrame<DeferredExecution> frame = frames.getFirst();
Selection selection = frame.nextSelection();
if (selection == null) {
frames.pop();
continue;
}
collectSelection(parameters, visitedFragments, fields, frames, frame.getContext(), selection, incrementalSupport);
}
}

private void collectSelection(FieldCollectorParameters parameters, Set<String> visitedFragments, Map<String, MergedField> fields,
Deque<SelectionSetTraversalFrame<DeferredExecution>> frames, DeferredExecution deferredExecution,
Selection selection, boolean incrementalSupport) {
if (selection instanceof Field) {
collectField(parameters, fields, (Field) selection, deferredExecution);
} else if (selection instanceof InlineFragment) {
collectInlineFragment(parameters, frames, (InlineFragment) selection, incrementalSupport);
} else if (selection instanceof FragmentSpread) {
collectFragmentSpread(parameters, visitedFragments, frames, (FragmentSpread) selection, incrementalSupport);
}
}

private void collectFragmentSpread(FieldCollectorParameters parameters, Set<String> visitedFragments, Map<String, MergedField> fields, FragmentSpread fragmentSpread, boolean incrementalSupport) {
private void collectFragmentSpread(FieldCollectorParameters parameters, Set<String> visitedFragments, Deque<SelectionSetTraversalFrame<DeferredExecution>> frames, FragmentSpread fragmentSpread, boolean incrementalSupport) {
if (visitedFragments.contains(fragmentSpread.getName())) {
return;
}
Expand Down Expand Up @@ -111,10 +127,10 @@ private void collectFragmentSpread(FieldCollectorParameters parameters, Set<Stri
DeferredExecution::new
) : null;

collectFields(parameters, fragmentDefinition.getSelectionSet(), visitedFragments, fields, deferredExecution, incrementalSupport);
frames.push(new SelectionSetTraversalFrame<>(fragmentDefinition.getSelectionSet(), deferredExecution));
}

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

collectFields(parameters, inlineFragment.getSelectionSet(), visitedFragments, fields, deferredExecution, incrementalSupport);
frames.push(new SelectionSetTraversalFrame<>(inlineFragment.getSelectionSet(), deferredExecution));
}

private void collectField(FieldCollectorParameters parameters, Map<String, MergedField> fields, Field field, DeferredExecution deferredExecution) {
Expand Down
40 changes: 40 additions & 0 deletions src/main/java/graphql/util/SelectionSetTraversalFrame.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package graphql.util;

import graphql.Internal;
import graphql.language.Selection;
import graphql.language.SelectionSet;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

import java.util.List;

/**
* Tracks a selection-set cursor and its context for iterative fragment expansion.
* {@link graphql.execution.FieldCollector} carries the deferred-execution context;
* {@link graphql.validation.OperationValidator} carries the parent type for field-merge validation.
* Both use these frames on explicit stacks to preserve selection order and context
* without growing the Java call stack with fragment indirection.
*/
@Internal
@NullMarked
public final class SelectionSetTraversalFrame<T> {
private final List<Selection> selections;
private final @Nullable T context;
private int nextSelection;

public SelectionSetTraversalFrame(SelectionSet selectionSet, @Nullable T context) {
this.selections = selectionSet.getSelections();
this.context = context;
}

public @Nullable Selection<?> nextSelection() {
if (nextSelection == selections.size()) {
return null;
}
return selections.get(nextSelection++);
}

public @Nullable T getContext() {
return context;
}
}
15 changes: 0 additions & 15 deletions src/main/java/graphql/validation/DocumentVisitor.java

This file was deleted.

44 changes: 0 additions & 44 deletions src/main/java/graphql/validation/LanguageTraversal.java

This file was deleted.

97 changes: 97 additions & 0 deletions src/main/java/graphql/validation/OperationValidationFrame.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
package graphql.validation;

import graphql.Internal;
import graphql.language.FragmentDefinition;
import graphql.language.Node;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

import java.util.List;

import static graphql.Assert.assertNotNull;

@Internal
@NullMarked
public final class OperationValidationFrame {
private final Node<?> node;
private final boolean fragmentExpansion;
private final int fieldCountBefore;
private final int depthAtEntry;
private final int previousFragmentMaxDepth;
private boolean entered;
private boolean childrenStarted;
private @Nullable List<Node> children;
private int nextChild;

public OperationValidationFrame(Node<?> node) {
this(node, false, 0, 0, 0);
}

public OperationValidationFrame(Node<?> node, List<Node> children) {
this(node);
this.entered = true;
this.children = children;
}

public OperationValidationFrame(FragmentDefinition fragment, int fieldCountBefore, int depthAtEntry, int previousFragmentMaxDepth) {
this(fragment, true, fieldCountBefore, depthAtEntry, previousFragmentMaxDepth);
}

private OperationValidationFrame(Node<?> node, boolean fragmentExpansion, int fieldCountBefore, int depthAtEntry, int previousFragmentMaxDepth) {
this.node = node;
this.fragmentExpansion = fragmentExpansion;
this.fieldCountBefore = fieldCountBefore;
this.depthAtEntry = depthAtEntry;
this.previousFragmentMaxDepth = previousFragmentMaxDepth;
}

public Node<?> getNode() {
return node;
}

public boolean enter() {
if (entered) {
return false;
}
entered = true;
return true;
}

public boolean startChildren() {
if (childrenStarted) {
return false;
}
childrenStarted = true;
if (children == null) {
children = node.getChildren();
}
return true;
}

public @Nullable Node<?> nextChild() {
List<Node> nodes = assertNotNull(children);
while (nextChild < nodes.size()) {
Node<?> child = nodes.get(nextChild++);
if (child != null) {
return child;
}
}
return null;
}

public boolean isFragmentExpansion() {
return fragmentExpansion;
}

public int getFieldCountBefore() {
return fieldCountBefore;
}

public int getDepthAtEntry() {
return depthAtEntry;
}

public int getPreviousFragmentMaxDepth() {
return previousFragmentMaxDepth;
}
}
Loading
Loading