Fix future queries with non lazy associations #2174
Merged
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
bahusoid
changed the title
bahusoid
force-pushed
the
gh2173FutureNonLazy
branch
from
03927b6 to
1148aa9
Compare
bahusoid
changed the title
This comment has been minimized.
This comment has been minimized.
bahusoid
force-pushed
the
gh2173FutureNonLazy
branch
from
27a36e5 to
10f9746
Compare
bahusoid
commented
Jun 12, 2019
| foreach (var query in _queries) | ||
| { | ||
| if (query.CachingInformation != null) | ||
| { | ||
| foreach (var cachingInfo in query.CachingInformation.Where(ci => ci.IsCacheable)) |
There was a problem hiding this comment.
cacheBatcher is also needed when query is not cacheable but loaded entities are cacheable - so it's better to always set it.
bahusoid
changed the title
|
@bahusoid is it regression? If so, could you please re-target to 5.2.x? |
bahusoid
force-pushed
the
gh2173FutureNonLazy
branch
from
f12beb8 to
5e39340
Compare
bahusoid
commented
Jun 13, 2019
| @@ -103,7 +103,7 @@ public async Task<int> ProcessResultsSetAsync(DbDataReader reader, CancellationT | |||
|
|
|||
| queryInfo.Result = tmpResults; | |||
| if (queryInfo.CanPutToCache) | |||
| queryInfo.ResultToCache = tmpResults; | |||
| queryInfo.ResultToCache = new List<object>(tmpResults); | |||
There was a problem hiding this comment.
When merging to master this change should be ignored. The following code is expected in master (no need to wrap in new List):
queryInfo.ResultToCache = queryCacheBuilder.Result;
hazzik
approved these changes
Jul 16, 2019
Merged
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 #2173 (some technical details behind this issue can be found here)
Implemented the following fix:
MultiCriteriaImpl/MultiQueryImpl)LoadingCollectionEntry.StopLoadingflag that indicates that collection should not be populated. This allows to delay actual collection initialization till all other batch queries are processed (so it's a fix for NH-3350 - Duplicate records using Future() #1293)Issue is introduced in 5.2 with new
QueryBatchimplementation.