[PubgrubTests] Handle duplicate product keys in DependencyGraphBuilder.serve
#3564
Conversation
This file contains hidden or 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
WowbaggersLiquidLunch
requested review from
abertelrud,
friedbunny,
neonichu and
tomerd
as code owners
tomerd
approved these changes
Jun 21, 2021
Contributor
|
@swift-ci please smoke test |
…ependencyGraphBuilder.serve` [One of the callers](https://github.com/apple/swift-package-manager/blob/20eba126ffa32088abb46d642bd0481dbae212ef/Tests/PackageGraphTests/PubgrubTests.swift#L472-L475) of the function passes in a dictionary literal with duplicate keys. Although the logic in this function suggests that duplicate keys are allowed, `TSCBasic.OrderedDictionary` preserves only [the final](https://github.com/apple/swift-tools-support-core/blob/21a79185b2ea8f89b9253ed8cdf2338bf564c499/Sources/TSCBasic/OrderedDictionary.swift#L97-L99) of all duplicate keys' values in a dictionary literal. In addition, with swiftlang#3533, Swift Collections' `OrderedDictionary` [traps](https://github.com/apple/swift-collections/blob/c0549b6284aadd5fd13156316f43fcb43c7fca77/Sources/OrderedCollections/OrderedDictionary/OrderedDictionary%2BInitializers.swift#L88-L91) on duplicate keys. `KeyValuePairs` seems like the right replacement that allows duplicate keys.
WowbaggersLiquidLunch
force-pushed
the
use-KeyValuePairs-for-duplicate-keys
branch
from
cc736a7 to
4802fc4
Compare
WowbaggersLiquidLunch
changed the title
OrderedDictionary with KeyValuePairs in DependencyGraphBuilder.serveDependencyGraphBuilder.serve
…dictionary keyed by `product` `dependencies` passed to `DependencyGraphBuilder.serve` can have duplicate product keys, so when `dependencies` are iterated, the same `product` can appear more than once, each time with possibly different `filteredDependencies`. Assigning `packageDependencies` mapped from a `product`'s `filteredDependencies` to the value in a different dictionary keyed by the same `product` overrides any existing value from a previous assignment. Appending `packageDependencies` instead preserves all previous values.
WowbaggersLiquidLunch
force-pushed
the
use-KeyValuePairs-for-duplicate-keys
branch
from
4802fc4 to
dfd4217
Compare
Contributor
|
@swift-ci please smoke test |
Contributor
|
thanks @WowbaggersLiquidLunch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 2 places where
DependencyGraphBuilder.servemishandlesdependencieswith duplicate keys (products).One of the callers of the function passes in a dictionary literal with duplicate keys. Although the logic in this function suggests that duplicate keys are allowed,
TSCBasic.OrderedDictionarypreserves only the final of all duplicate keys' values in a dictionary literal. In addition, with Adopt Swift Collections'OrderedSetandOrderedDictionary#3533, Swift Collections'OrderedDictionarytraps on duplicate keys.KeyValuePairsseems like the right replacement that allows duplicate keys.Because of the duplicate keys, when
dependenciesare iterated, the sameproductcan appear more than once, each time with possibly differentfilteredDependencies. In each iteration, thefilteredDependenciesassociated with theproductis mapped topackageDependencies, which is then assigned to the value in a different dictionary keyed by the sameproduct, overriding any existing value from a possible previous assignment. Changing the assignment to an appending operation preserves all previous values.