Skip to content

MergedField single field support #4056

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
bbakerman merged 6 commits into from
Aug 2, 2025
Merged

MergedField single field support #4056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5613d0f
MergedField single field support
bbakerman Jul 23, 2025
dbd0711
MergedField single field support - added a class instead of managing …
bbakerman Jul 23, 2025
05ef826
MergedField single field support -code re-org
bbakerman Jul 23, 2025
8bd0257
MergedField single field support - made the builder even more lazy
bbakerman Jul 24, 2025
33c20ae
Merge remote-tracking branch 'origin/master' into mergedfield-single-…
bbakerman Jul 31, 2025
d98674b
removed .equals on DeferredExecution
bbakerman Aug 1, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/graphql/execution/ExecutionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public static String mkNameForPath(Field currentField) {

@Internal
public static String mkNameForPath(MergedField mergedField) {
return mkNameForPath(mergedField.getFields());
return mergedField.getResultKey();
Copy link
Member Author

@bbakerman bbakerman Jul 23, 2025

Choose a reason for hiding this comment

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

dont materialise the list just to get the first one and its result key

}

@Internal
Expand Down
16 changes: 6 additions & 10 deletions src/main/java/graphql/execution/FieldCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@ public MergedSelectionSet collectFields(FieldCollectorParameters parameters, Mer
public MergedSelectionSet collectFields(FieldCollectorParameters parameters, MergedField mergedField, boolean incrementalSupport) {
Map<String, MergedField> subFields = new LinkedHashMap<>();
Set<String> visitedFragments = new LinkedHashSet<>();
for (Field field : mergedField.getFields()) {
if (field.getSelectionSet() == null) {
continue;
mergedField.forEach(field -> {
if (field.getSelectionSet() != null) {
this.collectFields(parameters, field.getSelectionSet(), visitedFragments, subFields, null, incrementalSupport);
}
this.collectFields(parameters, field.getSelectionSet(), visitedFragments, subFields, null, incrementalSupport);
}
});
Copy link
Member Author

@bbakerman bbakerman Jul 23, 2025

Choose a reason for hiding this comment

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

This was a consumer pattern - not wont materialise the list to consume the values

return newMergedSelectionSet().subFields(subFields).build();
}

Expand Down Expand Up @@ -142,11 +141,8 @@ private void collectField(FieldCollectorParameters parameters, Map<String, Merge
}
String name = field.getResultKey();
if (fields.containsKey(name)) {
MergedField curFields = fields.get(name);
fields.put(name, curFields.transform(builder -> builder
.addField(field)
.addDeferredExecution(deferredExecution))
);
MergedField currentMergedField = fields.get(name);
fields.put(name, currentMergedField.newMergedFieldWith(field,deferredExecution));
Copy link
Member Author

@bbakerman bbakerman Jul 23, 2025

Choose a reason for hiding this comment

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

The newMergedFieldWith method doesn't allocate a builder to make a new merged field like this builder does

} else {
fields.put(name, MergedField.newSingletonMergedField(field, deferredExecution));
}
Expand Down
Loading