Skip to content

Commit 9fae7b9

Browse files
fixup! Support CacheMode in QueryBatch
Fix the cache mode switch, and clean some trash.
1 parent 27a0012 commit 9fae7b9

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/NHibernate/Async/Multi/QueryBatchItemBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public async Task<int> ProcessResultsSetAsync(DbDataReader reader, CancellationT
3535
var dialect = Session.Factory.Dialect;
3636
var hydratedObjects = new List<object>[_queryInfos.Count];
3737

38-
using (Session.SwitchCacheMode(CacheMode.Get))
38+
using (Session.SwitchCacheMode(_cacheMode))
3939
{
4040
var rowCount = 0;
4141
for (var i = 0; i < _queryInfos.Count; i++)

src/NHibernate/Multi/QueryBatchItemBase.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public abstract partial class QueryBatchItemBase<TResult> : IQueryBatchItem<TRes
2020
private List<EntityKey[]>[] _subselectResultKeys;
2121
private List<QueryInfo> _queryInfos;
2222
private CacheMode? _cacheMode;
23-
private bool? _isReadOnly;
2423
private IList<TResult> _finalResults;
2524

2625
protected class QueryInfo : ICachingInformation
@@ -139,9 +138,7 @@ public virtual void Init(ISessionImplementor session)
139138

140139
_queryInfos = GetQueryInformation(session);
141140
// Cache and readonly parameters are the same for all translators
142-
var queryParameters = _queryInfos.First().Parameters;
143-
_cacheMode = queryParameters.CacheMode;
144-
_isReadOnly = queryParameters.IsReadOnlyInitialized ? queryParameters.ReadOnly : default(bool?);
141+
_cacheMode = _queryInfos.First().Parameters.CacheMode;
145142

146143
var count = _queryInfos.Count;
147144
_subselectResultKeys = new List<EntityKey[]>[count];
@@ -177,7 +174,7 @@ public int ProcessResultsSet(DbDataReader reader)
177174
var dialect = Session.Factory.Dialect;
178175
var hydratedObjects = new List<object>[_queryInfos.Count];
179176

180-
using (Session.SwitchCacheMode(CacheMode.Get))
177+
using (Session.SwitchCacheMode(_cacheMode))
181178
{
182179
var rowCount = 0;
183180
for (var i = 0; i < _queryInfos.Count; i++)

0 commit comments

Comments
 (0)