fix(query-planner): handle multiple __typename selections #3164
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
🦋 Changeset detectedLatest commit: 894a1d6 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 |
✅ Docs Preview ReadyNo new or changed pages found. |
✅ Deploy Preview for apollo-federation-docs canceled.
|
|
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. |
6 tasks
…t directives - fixed sibling typename optimization to only fold plain __typename without alias/directives. - fixed selectionsInPrintOrder to not drop duplicate __typename selections.
dariuszkuc
force-pushed
the
duckki/router-801-js-part
branch
from
e5863c2 to
894a1d6
Compare
dariuszkuc
approved these changes
Oct 14, 2024
sachindshinde
pushed a commit
that referenced
this pull request
Oct 16, 2024
This PR was opened by the [Changesets release](https://github.com/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/composition@2.9.3 ### Patch Changes - Updated dependencies \[[`345661c558773e4eb5d5f0b28464a8d1acdc2a2d`](345661c), [`e00e1c9892b48ac89823597113989830877966ef`](e00e1c9), [`cc4573471696ef78d04fa00c4cf8e5c50314ba9f`](cc45734), [`062572b3253e8640b60a0bf58b83945094b76b6f`](062572b), [`df5eb3cb0e2b4802fcd425ab9c23714de2707db3`](df5eb3c), [`1c99cb0dcc6c639ac351210932623ab0bd6907e4`](1c99cb0)]: - @apollo/query-graphs@2.9.3 - @apollo/federation-internals@2.9.3 ## @apollo/gateway@2.9.3 ### Patch Changes - Updated dependencies \[[`345661c558773e4eb5d5f0b28464a8d1acdc2a2d`](345661c), [`7fe1465cf35c2efe37ac5c73fac2b7ea04173318`](7fe1465), [`cc4573471696ef78d04fa00c4cf8e5c50314ba9f`](cc45734), [`062572b3253e8640b60a0bf58b83945094b76b6f`](062572b), [`df5eb3cb0e2b4802fcd425ab9c23714de2707db3`](df5eb3c), [`1c99cb0dcc6c639ac351210932623ab0bd6907e4`](1c99cb0)]: - @apollo/query-planner@2.9.3 - @apollo/federation-internals@2.9.3 - @apollo/composition@2.9.3 ## @apollo/federation-internals@2.9.3 ### Patch Changes - fix: normalize field set selection sets ([#3162](#3162)) `FieldSet` scalar represents a selection set without outer braces. This means that users could potentially specify some selections that could be normalized (i.e. eliminate duplicate field selections, hoist/collapse unnecessary inline fragments, etc). Previously we were using `@requires` field set selection AS-IS for edge conditions. With this change we will now normalize the `FieldSet` selections before using them as fetch node conditions. - Fixed missing referenced variables in the `variableUsages` field of fetch operations ([#3166](#3166)) Query variables used in fetch operation should be listed in the `variableUsages` field. However, there was a bug where variables referenced by query-level directives could be missing in the field. - Fix fragment generation recursion logic to apply minification on all subselections. ([#3158](#3158)) - Fixed a bug that `__typename` with applied directives gets lost in fetch operations. ([#3164](#3164)) The sibling typename optimization used by query planner simplifies operations by folding `__typename` selections into their sibling selections. However, that optimization does not account for directives or aliases. The bug was applying the optimization even if the `__typename` has directives on it, which caused the selection to lose its directives. Now, `__typename` with directives (or aliases) are excluded from the optimization. ## @apollo/query-graphs@2.9.3 ### Patch Changes - Fixes edge case where contextual arguments can yield inefficient query plans. Also fixes naming of query plan arguments which can be a problem when using contextual variables in multiple subgraphs ([#3140](#3140)) - When eliminating suboptimal indirect paths during query planning, properly check for a direct `@key` edge at the end of the potential direct path. ([#3160](#3160)) - Fixed missing referenced variables in the `variableUsages` field of fetch operations ([#3166](#3166)) Query variables used in fetch operation should be listed in the `variableUsages` field. However, there was a bug where variables referenced by query-level directives could be missing in the field. - Updated dependencies \[[`cc4573471696ef78d04fa00c4cf8e5c50314ba9f`](cc45734), [`062572b3253e8640b60a0bf58b83945094b76b6f`](062572b), [`df5eb3cb0e2b4802fcd425ab9c23714de2707db3`](df5eb3c), [`1c99cb0dcc6c639ac351210932623ab0bd6907e4`](1c99cb0)]: - @apollo/federation-internals@2.9.3 ## @apollo/query-planner@2.9.3 ### Patch Changes - Fixes edge case where contextual arguments can yield inefficient query plans. Also fixes naming of query plan arguments which can be a problem when using contextual variables in multiple subgraphs ([#3140](#3140)) - Ensure all useless fetch groups are removed ([#3163](#3163)) When removing "useless" fetch nodes/groups we remove them in-place while still iterating over the same list. This leads to potentially skipping processing of some the children fetch nodes, as when we remove nodes we left shift all remaining children but the iterator keeps the old position unchanged effectively skipping next child. - fix: normalize field set selection sets ([#3162](#3162)) `FieldSet` scalar represents a selection set without outer braces. This means that users could potentially specify some selections that could be normalized (i.e. eliminate duplicate field selections, hoist/collapse unnecessary inline fragments, etc). Previously we were using `@requires` field set selection AS-IS for edge conditions. With this change we will now normalize the `FieldSet` selections before using them as fetch node conditions. - Fixed missing referenced variables in the `variableUsages` field of fetch operations ([#3166](#3166)) Query variables used in fetch operation should be listed in the `variableUsages` field. However, there was a bug where variables referenced by query-level directives could be missing in the field. - Fixed a bug that `__typename` with applied directives gets lost in fetch operations. ([#3164](#3164)) The sibling typename optimization used by query planner simplifies operations by folding `__typename` selections into their sibling selections. However, that optimization does not account for directives or aliases. The bug was applying the optimization even if the `__typename` has directives on it, which caused the selection to lose its directives. Now, `__typename` with directives (or aliases) are excluded from the optimization. - Updated dependencies \[[`345661c558773e4eb5d5f0b28464a8d1acdc2a2d`](345661c), [`e00e1c9892b48ac89823597113989830877966ef`](e00e1c9), [`cc4573471696ef78d04fa00c4cf8e5c50314ba9f`](cc45734), [`062572b3253e8640b60a0bf58b83945094b76b6f`](062572b), [`df5eb3cb0e2b4802fcd425ab9c23714de2707db3`](df5eb3c), [`1c99cb0dcc6c639ac351210932623ab0bd6907e4`](1c99cb0)]: - @apollo/query-graphs@2.9.3 - @apollo/federation-internals@2.9.3 ## @apollo/subgraph@2.9.3 ### Patch Changes - Updated dependencies \[[`cc4573471696ef78d04fa00c4cf8e5c50314ba9f`](cc45734), [`062572b3253e8640b60a0bf58b83945094b76b6f`](062572b), [`df5eb3cb0e2b4802fcd425ab9c23714de2707db3`](df5eb3c), [`1c99cb0dcc6c639ac351210932623ab0bd6907e4`](1c99cb0)]: - @apollo/federation-internals@2.9.3 ## apollo-federation-integration-testsuite@2.9.3 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.
Problem
The sibling typename optimization treated
__typenameand__typename @skip(if:$X)interchangeably. Thus, one could become a sibling of the other, depending on the order they appear in query. That is problematic, since sibling typename should not have directives or aliases.Also, there was another bug in
selectionsInPrintOrderfunction where some __typename selections with directives could be dropped unexpectedly if there are multiple __typename selections in the same selection set.Fix Summary
selectionsInPrintOrderto not drop duplicate __typename selections with directives.