Fix a query planning bug where invalid subgraph queries are generated with reuseQueryFragments set true
#2963
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
👷 Deploy request for apollo-federation-docs pending review.Visit the deploys page to approve it
|
🦋 Changeset detectedLatest commit: 1a5211e The changes in this PR will be included in the next version bump. This PR includes changesets to release 7 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. |
- updated computeExpandedSelectionSetAtType function not to trim fragment's validators if the fragment's type condition is not an object type. - This change is necessary because `FieldsInSetCanMerge` rule is more restrictive in that case. - The untrimmed validator should avoid generating invalid queries, but it may be less efficient. apollographql#2952
|
@dariuszkuc I just rebased this PR on top of current origin/main. Please review. Thanks! |
|
@goto-bus-stop Please also review this one :)
|
internals-js/src/operations.ts
Outdated
| @@ -1224,6 +1224,14 @@ export class NamedFragmentDefinition extends DirectiveTargetElement<NamedFragmen | |||
| const expandedSelectionSet = this.expandedSelectionSet(); | |||
| const selectionSet = expandedSelectionSet.normalize({ parentType: type }); | |||
|
|
|||
| if( ! isObjectType(this.typeCondition) ) { | |||
There was a problem hiding this comment.
Suggested change
| if( ! isObjectType(this.typeCondition) ) { | |
| if (!isObjectType(this.typeCondition)) { |
just style (not familiar with this repo, i'm not sure why it isn't enforced 🤔 )
| * @param subgraphs | ||
| */ | ||
| function validateSubFetches( | ||
| plan: any, |
There was a problem hiding this comment.
Suggested change
| plan: any, | |
| plan: PlanNode | SubscriptionNode | undefined, |
if these types are not available in this file they should be imported from ../QueryPlan.ts
goto-bus-stop
approved these changes
Apr 3, 2024
|
@goto-bus-stop Thanks for the review. I pushed a fix. |
o0Ignition0o
pushed a commit
that referenced
this pull request
Apr 16, 2024
This PR was opened by the [Changesets release](https:/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @apollo/[email protected] ### Patch Changes - Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](#2952)) ([#2963](#2963)) - Updated dependencies \[[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](ec04c50), [`a494631918156f0431ceace74281c076cf1d5d51`](a494631)]: - @apollo/[email protected] - @apollo/[email protected] ## @apollo/[email protected] ### Patch Changes - Updated dependencies \[[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](ec04c50), [`3e2c845c74407a136b9e0066e44c1ad1467d3013`](3e2c845), [`a494631918156f0431ceace74281c076cf1d5d51`](a494631)]: - @apollo/[email protected] - @apollo/[email protected] - @apollo/[email protected] ## @apollo/[email protected] ### Patch Changes - Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](#2952)) ([#2963](#2963)) - Fixed query planner to pass the directives from original query to subgraph operations (#2961) ([#2967](#2967)) ## @apollo/[email protected] ### Patch Changes - Updated dependencies \[[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](ec04c50), [`a494631918156f0431ceace74281c076cf1d5d51`](a494631)]: - @apollo/[email protected] ## @apollo/[email protected] ### Patch Changes - Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](#2952)) ([#2963](#2963)) - Type conditioned fetching ([#2949](#2949)) When querying a field that is in a path of 2 or more unions, the query planner was not able to handle different selections and would aggressively collapse selections in fetches yielding an incorrect plan. This change introduces new syntax to express type conditions in (key and flatten) paths. Type conditioned fetching can be enabled through a flag, and execution is supported in the router only. (#2938) - Fixed query planner to pass the directives from original query to subgraph operations (#2961) ([#2967](#2967)) - Updated dependencies \[[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](ec04c50), [`a494631918156f0431ceace74281c076cf1d5d51`](a494631)]: - @apollo/[email protected] - @apollo/[email protected] ## @apollo/[email protected] ### Patch Changes - Updated dependencies \[[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](ec04c50), [`a494631918156f0431ceace74281c076cf1d5d51`](a494631)]: - @apollo/[email protected] ## [email protected] Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes #2952.
Summary of changes
FieldsInSetCanMergerule is more restrictive in that case.Test plan