Don't escape separator characters in single key values #35252
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
Fixes #35224 When we generate a key containing multiple values, then we escape the separator character if it is found in any of the values. However, we should not do this if the key is made up of a single value and so will have no separators.
roji
reviewed
Dec 2, 2024
| @@ -102,6 +108,7 @@ public virtual ISetSource GetExpectedData() | |||
| { typeof(HierarchicalPartitionKeyEntity), e => ((HierarchicalPartitionKeyEntity?)e)?.Id }, | |||
| { typeof(OnlyHierarchicalPartitionKeyEntity), e => ((OnlyHierarchicalPartitionKeyEntity?)e)?.Payload }, | |||
| { typeof(SinglePartitionKeyEntity), e => ((SinglePartitionKeyEntity?)e)?.Id }, | |||
| { typeof(Cat35224), e => ((Cat35224?)e)?.Id }, | |||
There was a problem hiding this comment.
This looks like an ideal case of a non-shared test to me...
AndriySvyryd
reviewed
Dec 3, 2024
| @@ -89,23 +89,24 @@ public virtual string GenerateIdString(IEnumerable<object?> values) | |||
|
|
|||
| if (_discriminatorProperty != null) | |||
| { | |||
| AppendValue(_discriminatorProperty!, _discriminatorValue!); | |||
| AppendValue(_discriminatorProperty!, _discriminatorValue!, false); | |||
There was a problem hiding this comment.
Suggested change
| AppendValue(_discriminatorProperty!, _discriminatorValue!, false); | |
| AppendValue(_discriminatorProperty!, _discriminatorValue!, singleValue: false); |
AndriySvyryd
reviewed
Dec 3, 2024
| builder = builder.Replace("|", "^|", startingIndex, builder.Length - startingIndex); | ||
| } | ||
|
|
||
| return builder |
There was a problem hiding this comment.
We should just let Cosmos throw for the invalid characters in single value mode to preserve the 1:1 doctrine.
AndriySvyryd
approved these changes
Dec 3, 2024
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.
Fixes #35224
When we generate a key containing multiple values, then we escape the separator character if it is found in any of the values. However, we should not do this if the key is made up of a single value and so will have no separators.