Skip to content

Commit e8ee191

Browse files
hazzikhazzik
committed
Code cleanup
1 parent d5cb9d9 commit e8ee191

File tree

4 files changed

+47
-53
lines changed

4 files changed

+47
-53
lines changed

‎src/NHibernate/Action/BulkOperationCleanupAction.cs

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,34 @@ public partial class BulkOperationCleanupAction :
1919
IAfterTransactionCompletionProcess,
2020
ICacheableExecutable
2121
{
22-
private readonly ISessionImplementor session;
23-
private readonly HashSet<string> affectedEntityNames = new HashSet<string>();
24-
private readonly HashSet<string> affectedCollectionRoles = new HashSet<string>();
25-
private readonly List<string> spaces;
22+
private readonly ISessionFactoryImplementor _factory;
23+
private readonly HashSet<string> _affectedEntityNames = new HashSet<string>();
24+
private readonly HashSet<string> _affectedCollectionRoles = new HashSet<string>();
25+
private readonly string[] _spaces;
2626
private readonly bool _hasCache;
2727

2828
public BulkOperationCleanupAction(ISessionImplementor session, IQueryable[] affectedQueryables)
2929
{
30-
this.session = session;
31-
List<string> tmpSpaces = new List<string>();
32-
for (int i = 0; i < affectedQueryables.Length; i++)
30+
_factory = session.Factory;
31+
var tmpSpaces = new HashSet<string>();
32+
foreach (var queryables in affectedQueryables)
3333
{
34-
if (affectedQueryables[i].HasCache)
34+
if (queryables.HasCache)
3535
{
3636
_hasCache = true;
37-
affectedEntityNames.Add(affectedQueryables[i].EntityName);
37+
_affectedEntityNames.Add(queryables.EntityName);
3838
}
39-
ISet<string> roles = session.Factory.GetCollectionRolesByEntityParticipant(affectedQueryables[i].EntityName);
39+
40+
var roles = _factory.GetCollectionRolesByEntityParticipant(queryables.EntityName);
4041
if (roles != null)
4142
{
42-
affectedCollectionRoles.UnionWith(roles);
43-
}
44-
for (int y = 0; y < affectedQueryables[i].QuerySpaces.Length; y++)
45-
{
46-
tmpSpaces.Add(affectedQueryables[i].QuerySpaces[y]);
43+
_affectedCollectionRoles.UnionWith(roles);
4744
}
45+
46+
tmpSpaces.UnionWith(queryables.QuerySpaces);
4847
}
49-
spaces = new List<string>(tmpSpaces);
48+
49+
_spaces = tmpSpaces.ToArray();
5050
}
5151

5252
/// <summary>
@@ -55,36 +55,34 @@ public BulkOperationCleanupAction(ISessionImplementor session, IQueryable[] affe
5555
public BulkOperationCleanupAction(ISessionImplementor session, ISet<string> querySpaces)
5656
{
5757
//from H3.2 TODO: cache the autodetected information and pass it in instead.
58-
this.session = session;
58+
_factory = session.Factory;
5959

60-
ISet<string> tmpSpaces = new HashSet<string>(querySpaces);
61-
ISessionFactoryImplementor factory = session.Factory;
62-
IDictionary<string, IClassMetadata> acmd = factory.GetAllClassMetadata();
60+
var tmpSpaces = new HashSet<string>(querySpaces);
61+
var acmd = _factory.GetAllClassMetadata();
6362
foreach (KeyValuePair<string, IClassMetadata> entry in acmd)
6463
{
65-
string entityName = entry.Key;
66-
IEntityPersister persister = factory.GetEntityPersister(entityName);
67-
string[] entitySpaces = persister.QuerySpaces;
64+
var entityName = entry.Key;
65+
var persister = _factory.GetEntityPersister(entityName);
66+
var entitySpaces = persister.QuerySpaces;
6867

6968
if (AffectedEntity(querySpaces, entitySpaces))
7069
{
7170
if (persister.HasCache)
7271
{
7372
_hasCache = true;
74-
affectedEntityNames.Add(persister.EntityName);
73+
_affectedEntityNames.Add(persister.EntityName);
7574
}
76-
ISet<string> roles = session.Factory.GetCollectionRolesByEntityParticipant(persister.EntityName);
75+
76+
var roles = session.Factory.GetCollectionRolesByEntityParticipant(persister.EntityName);
7777
if (roles != null)
7878
{
79-
affectedCollectionRoles.UnionWith(roles);
80-
}
81-
for (int y = 0; y < entitySpaces.Length; y++)
82-
{
83-
tmpSpaces.Add(entitySpaces[y]);
79+
_affectedCollectionRoles.UnionWith(roles);
8480
}
81+
82+
tmpSpaces.UnionWith(entitySpaces);
8583
}
8684
}
87-
spaces = new List<string>(tmpSpaces);
85+
_spaces = tmpSpaces.ToArray();
8886
}
8987

9088
private bool AffectedEntity(ISet<string> querySpaces, string[] entitySpaces)
@@ -94,18 +92,14 @@ private bool AffectedEntity(ISet<string> querySpaces, string[] entitySpaces)
9492
return true;
9593
}
9694

97-
9895
return entitySpaces.Any(querySpaces.Contains);
9996
}
10097

10198
public bool HasCache => _hasCache;
10299

103100
#region IExecutable Members
104101

105-
public string[] PropertySpaces
106-
{
107-
get { return spaces.ToArray(); }
108-
}
102+
public string[] PropertySpaces => _spaces;
109103

110104
public void BeforeExecutions()
111105
{
@@ -141,17 +135,17 @@ public void ExecuteAfterTransactionCompletion(bool success)
141135

142136
private void EvictCollectionRegions()
143137
{
144-
if (affectedCollectionRoles != null && affectedCollectionRoles.Any())
138+
if (_affectedCollectionRoles != null && _affectedCollectionRoles.Any())
145139
{
146-
session.Factory.EvictCollection(affectedCollectionRoles);
140+
_factory.EvictCollection(_affectedCollectionRoles);
147141
}
148142
}
149143

150144
private void EvictEntityRegions()
151145
{
152-
if (affectedEntityNames != null && affectedEntityNames.Any())
146+
if (_affectedEntityNames != null && _affectedEntityNames.Any())
153147
{
154-
session.Factory.EvictEntity(affectedEntityNames);
148+
_factory.EvictEntity(_affectedEntityNames);
155149
}
156150
}
157151

‎src/NHibernate/Async/Action/BulkOperationCleanupAction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ private Task EvictCollectionRegionsAsync(CancellationToken cancellationToken)
7777
}
7878
try
7979
{
80-
if (affectedCollectionRoles != null && affectedCollectionRoles.Any())
80+
if (_affectedCollectionRoles != null && _affectedCollectionRoles.Any())
8181
{
82-
return session.Factory.EvictCollectionAsync(affectedCollectionRoles, cancellationToken);
82+
return _factory.EvictCollectionAsync(_affectedCollectionRoles, cancellationToken);
8383
}
8484
return Task.CompletedTask;
8585
}
@@ -97,9 +97,9 @@ private Task EvictEntityRegionsAsync(CancellationToken cancellationToken)
9797
}
9898
try
9999
{
100-
if (affectedEntityNames != null && affectedEntityNames.Any())
100+
if (_affectedEntityNames != null && _affectedEntityNames.Any())
101101
{
102-
return session.Factory.EvictEntityAsync(affectedEntityNames, cancellationToken);
102+
return _factory.EvictEntityAsync(_affectedEntityNames, cancellationToken);
103103
}
104104
return Task.CompletedTask;
105105
}

‎src/NHibernate/Async/Engine/ActionQueue.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private Task PreInvalidateCachesAsync(CancellationToken cancellationToken)
4848
}
4949
if (session.Factory.Settings.IsQueryCacheEnabled)
5050
{
51-
return session.Factory.UpdateTimestampsCache.PreInvalidateAsync(executedSpaces, cancellationToken);
51+
return session.Factory.UpdateTimestampsCache.PreInvalidateAsync(_spacesToInvalidate, cancellationToken);
5252
}
5353
return Task.CompletedTask;
5454
}
@@ -168,10 +168,10 @@ private async Task InvalidateCachesAsync(CancellationToken cancellationToken)
168168
cancellationToken.ThrowIfCancellationRequested();
169169
if (session.Factory.Settings.IsQueryCacheEnabled)
170170
{
171-
await (session.Factory.UpdateTimestampsCache.InvalidateAsync(executedSpaces, cancellationToken)).ConfigureAwait(false);
171+
await (session.Factory.UpdateTimestampsCache.InvalidateAsync(_spacesToInvalidate, cancellationToken)).ConfigureAwait(false);
172172
}
173173

174-
executedSpaces.Clear();
174+
_spacesToInvalidate.Clear();
175175
}
176176
private partial class BeforeTransactionCompletionProcessQueue
177177
{

‎src/NHibernate/Engine/ActionQueue.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public partial class ActionQueue
4343

4444
private readonly AfterTransactionCompletionProcessQueue afterTransactionProcesses;
4545
private readonly BeforeTransactionCompletionProcessQueue beforeTransactionProcesses;
46-
private readonly HashSet<string> executedSpaces;
46+
private readonly HashSet<string> _spacesToInvalidate;
4747

4848
public ActionQueue(ISessionImplementor session)
4949
{
@@ -59,7 +59,7 @@ public ActionQueue(ISessionImplementor session)
5959
afterTransactionProcesses = new AfterTransactionCompletionProcessQueue();
6060
beforeTransactionProcesses = new BeforeTransactionCompletionProcessQueue();
6161

62-
executedSpaces = new HashSet<string>();
62+
_spacesToInvalidate = new HashSet<string>();
6363
}
6464

6565
public virtual void Clear()
@@ -175,7 +175,7 @@ private void PreInvalidateCaches()
175175
{
176176
if (session.Factory.Settings.IsQueryCacheEnabled)
177177
{
178-
session.Factory.UpdateTimestampsCache.PreInvalidate(executedSpaces);
178+
session.Factory.UpdateTimestampsCache.PreInvalidate(_spacesToInvalidate);
179179
}
180180
}
181181

@@ -220,7 +220,7 @@ private void RegisterCleanupActions(IExecutable executable)
220220

221221
if (executable.PropertySpaces != null && (!(executable is ICacheableExecutable ce) || ce.HasCache))
222222
{
223-
executedSpaces.UnionWith(executable.PropertySpaces);
223+
_spacesToInvalidate.UnionWith(executable.PropertySpaces);
224224
}
225225
}
226226

@@ -298,10 +298,10 @@ private void InvalidateCaches()
298298
{
299299
if (session.Factory.Settings.IsQueryCacheEnabled)
300300
{
301-
session.Factory.UpdateTimestampsCache.Invalidate(executedSpaces);
301+
session.Factory.UpdateTimestampsCache.Invalidate(_spacesToInvalidate);
302302
}
303303

304-
executedSpaces.Clear();
304+
_spacesToInvalidate.Clear();
305305
}
306306

307307
/// <summary>

0 commit comments

Comments
 (0)