Fix to #29513 - Json: improve projection deduplication for scenarios containing collection indexers #29808
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
maumar
commented
Dec 9, 2022
| { | ||
| if (!_jsonCollectionNonConstantElementAccessMap.TryGetValue(index, out var collectionElementAccessParameter)) | ||
| { | ||
| collectionElementAccessParameter = Expression.Parameter(typeof(int?)); |
There was a problem hiding this comment.
we could store these values as int, rather than int? - this way we only need to perform convert to int once (i.e. here). If the value we get for the array is null, things break anyway later.
roji
reviewed
Dec 12, 2022
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Outdated
Show resolved
Hide resolved
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Outdated
Show resolved
Hide resolved
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Outdated
Show resolved
Hide resolved
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Show resolved
Hide resolved
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Show resolved
Hide resolved
roji
reviewed
Dec 12, 2022
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Show resolved
Hide resolved
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Outdated
Show resolved
Hide resolved
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Show resolved
Hide resolved
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Outdated
Show resolved
Hide resolved
...l/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
Outdated
Show resolved
Hide resolved
maumar
force-pushed
the
fix29513
branch
3 times, most recently
from
a4c718e
to
6ffd3e1
Compare
maumar
commented
Dec 14, 2022
| /// doing so can result in application failures when updating to a new Entity Framework Core release. | ||
| /// </remarks> | ||
| public (int? ConstantArrayIndex, int? NonConstantArrayIndex)[] ArrayElementAccessInfo { get; } | ||
| public List<(IProperty? KeyProperty, int? ConstantKeyValue, int? KeyProjectionIndex)> KeyAccessInfo { get; } |
There was a problem hiding this comment.
maybe different order? (Constant, KeyProperty, KeyProjectionIndex) or (KeyProperty, KeyProjectionIndex, Constant) ?
|
@roji new version up - JsonProjectionInfo refactoring in separate commit, all other feedback addressed in the initial one |
|
ping @roji |
roji
approved these changes
Dec 22, 2022
…containing collection indexers Reworking shaper to properly track key values for JSON entities that are accessed via array element. Every array access needs to be recorded and incorporated into the key later. Constants can be stored directly by value, non-constants are added to projection, and we keep track of the projection index instead. - added JsonProjectionInfo in place of a value tuple to store shaping info needed for JSON, so that it's more readable, - reworked JsonShapingPreProcess to generate and cache key values as well as JsonElement. - moved dangling (i.e. not coming from include on the owner entity) JSON entity processing after Include processing, so that we guarantee to have all the entities in state manager by the time we get to processing the dangling JSON stuff. Fixes #29513
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.
Reworking shaper to properly track key values for JSON entities that are accessed via array element. Every array access needs to be recorded and incorporated into the key later. Constants can be stored directly by value, non-constants are added to projection, and we keep track of the projection index instead.
Fixes #29513