Skip to content

Commit b7a321e

Browse files
committed
Address review comments
1 parent 3f434bf commit b7a321e

File tree

5 files changed

+92
-188
lines changed

5 files changed

+92
-188
lines changed

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
using System.Runtime.Versioning;
1212
using Microsoft.Data.Common;
1313
using Microsoft.Data.ProviderBase;
14-
using Microsoft.Data.SqlClient.Server;
1514
using Microsoft.Data.SqlClient.ConnectionPool;
15+
using Microsoft.Data.SqlClient.Server;
1616

1717
namespace Microsoft.Data.SqlClient
1818
{

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ namespace Microsoft.Data.SqlClient
1010
using System.Diagnostics;
1111
using System.Runtime.ConstrainedExecution;
1212
using System.Threading;
13+
using System.Transactions;
1314
using Microsoft.Data.Common;
1415
using Microsoft.Data.ProviderBase;
1516
using Microsoft.Data.SqlClient.ConnectionPool;
16-
using System.Transactions;
1717

1818
public sealed partial class SqlConnection : DbConnection
1919
{

src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ private void PruneConnectionPoolGroups(object state)
578578
if (0 == pool.Count)
579579
{
580580
_poolsToRelease.Remove(pool);
581-
SqlClientEventSource.Log.TryAdvancedTraceEvent("<prov.DbConnectionFactory.PruneConnectionPoolGroups|RES|INFO|CPOOL> {0}, ReleasePool={1}", ObjectID, pool.ObjectID);
581+
SqlClientEventSource.Log.TryAdvancedTraceEvent("<prov.DbConnectionFactory.PruneConnectionPoolGroups|RES|INFO|CPOOL> {0}, ReleasePool={1}", ObjectID, pool.ObjectId);
582582
#if NETFRAMEWORK
583583
PerformanceCounters.NumberOfInactiveConnectionPools.Decrement();
584584
#else

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPool.cs

Lines changed: 26 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -14,85 +14,37 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
1414
{
1515
internal abstract class DbConnectionPool
1616
{
17-
private static int _objectTypeCount; // EventSource counter
18-
internal readonly int _objectID = System.Threading.Interlocked.Increment(ref _objectTypeCount);
19-
20-
internal int ObjectID
21-
{
22-
get
23-
{
24-
return _objectID;
25-
}
26-
}
27-
28-
private DbConnectionPoolState _state;
29-
internal DbConnectionPoolState State
30-
{
31-
get => _state;
32-
set => _state = value;
33-
}
17+
private static int _objectTypeCount;
18+
19+
internal int ObjectId { get; } = System.Threading.Interlocked.Increment(ref _objectTypeCount);
20+
21+
internal DbConnectionPoolState State { get; set; }
3422

3523
#region Abstract Properties
36-
internal abstract int Count
37-
{
38-
get;
39-
}
40-
41-
internal abstract DbConnectionFactory ConnectionFactory
42-
{
43-
get;
44-
}
45-
46-
internal abstract bool ErrorOccurred
47-
{
48-
get;
49-
}
50-
51-
internal abstract TimeSpan LoadBalanceTimeout
52-
{
53-
get;
54-
}
55-
56-
internal abstract DbConnectionPoolIdentity Identity
57-
{
58-
get;
59-
}
60-
61-
internal abstract bool IsRunning
62-
{
63-
get;
64-
}
24+
internal abstract int Count { get; }
25+
26+
internal abstract DbConnectionFactory ConnectionFactory { get; }
27+
28+
internal abstract bool ErrorOccurred { get; }
29+
30+
internal abstract TimeSpan LoadBalanceTimeout { get; }
31+
32+
internal abstract DbConnectionPoolIdentity Identity { get; }
33+
34+
internal abstract bool IsRunning { get; }
6535

6636
#if NETFRAMEWORK
67-
internal abstract DbConnectionPoolCounters PerformanceCounters
68-
{
69-
get;
70-
}
37+
internal abstract DbConnectionPoolCounters PerformanceCounters { get; }
7138
#endif
72-
internal abstract DbConnectionPoolGroup PoolGroup
73-
{
74-
get;
75-
}
76-
77-
internal abstract DbConnectionPoolGroupOptions PoolGroupOptions
78-
{
79-
get;
80-
}
81-
82-
internal abstract DbConnectionPoolProviderInfo ProviderInfo
83-
{
84-
get;
85-
}
86-
87-
internal abstract ConcurrentDictionary<DbConnectionPoolAuthenticationContextKey, DbConnectionPoolAuthenticationContext> AuthenticationContexts
88-
{
89-
get;
90-
}
91-
92-
internal abstract bool UseLoadBalancing
93-
{
94-
get;
95-
}
39+
internal abstract DbConnectionPoolGroup PoolGroup { get; }
40+
41+
internal abstract DbConnectionPoolGroupOptions PoolGroupOptions { get; }
42+
43+
internal abstract DbConnectionPoolProviderInfo ProviderInfo { get; }
44+
45+
internal abstract ConcurrentDictionary<DbConnectionPoolAuthenticationContextKey, DbConnectionPoolAuthenticationContext> AuthenticationContexts { get; }
46+
47+
internal abstract bool UseLoadBalancing { get; }
9648
#endregion
9749

9850
#region Abstract Methods

0 commit comments

Comments
 (0)