Skip to content

improve overlapping fields performance #2495

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
andimarek merged 7 commits into from
Aug 2, 2021
Merged

improve overlapping fields performance #2495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
202ef3e
rewrote overlapping fields, tests not fixed up
andimarek Jul 31, 2021
05f3766
fix units tests by adjusting error strings
andimarek Aug 2, 2021
370f1cc
Merge branch 'master' into overlapping-fields-performance
andimarek Aug 2, 2021
c7b12f5
cleanup
andimarek Aug 2, 2021
fdc3be2
doc reference to the source of the algorithm
andimarek Aug 2, 2021
acd6d1c
doc reference to the source of the algorithm
andimarek Aug 2, 2021
30f78ad
PR feedback
andimarek Aug 2, 2021
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
11 changes: 0 additions & 11 deletions src/main/java/graphql/util/Anonymizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,17 +741,6 @@ public TraversalControl visitDirective(Directive directive, TraverserContext<Nod
return changeNode(context, directive.transform(builder -> builder.name(newName)));
}

// @Override
// public TraversalControl visitStringValue(StringValue node, TraverserContext<Node> context) {
// return changeNode(context, node.transform(builder -> builder.value("stringValue" + stringValueCounter.getAndIncrement())));
// }
//
// @Override
// public TraversalControl visitIntValue(IntValue node, TraverserContext<Node> context) {
// return changeNode(context, node.transform(builder -> builder.value(BigInteger.valueOf(intValueCounter.getAndIncrement()))));
// }
//

Copy link
Member

@bbakerman bbakerman Aug 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this meant?

Copy link
Member Author

@andimarek andimarek Aug 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deleting commented out code .. not directly related to this PR

@Override
public TraversalControl visitOperationDefinition(OperationDefinition node, TraverserContext<Node> context) {
if (node.getName() != null) {
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/graphql/util/FpKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.OptionalInt;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction;
import java.util.function.BinaryOperator;
Expand Down Expand Up @@ -276,6 +278,16 @@ public static <T> List<T> filterList(Collection<T> list, Predicate<T> filter) {
.collect(Collectors.toList());
}

public static <T> Set<T> filterSet(Set<T> input, Predicate<T> filter) {
LinkedHashSet<T> result = new LinkedHashSet<>();
for (T t : input) {
if (filter.test(t)) {
result.add(t);
}
}
return result;
}

/**
* Used in simple {@link Map#computeIfAbsent(Object, java.util.function.Function)} cases
*
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/graphql/validation/AbstractRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import graphql.language.VariableReference;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import static graphql.validation.ValidationError.newValidationError;
Expand Down Expand Up @@ -51,7 +52,7 @@ public ValidationUtil getValidationUtil() {
return validationUtil;
}

public void addError(ValidationErrorType validationErrorType, List<? extends Node<?>> locations, String description) {
public void addError(ValidationErrorType validationErrorType, Collection<? extends Node<?>> locations, String description) {
List<SourceLocation> locationList = new ArrayList<>();
for (Node<?> node : locations) {
locationList.add(node.getSourceLocation());
Expand Down
Loading