Skip to content

Commit 6d33e9d

Browse files
edwardnealedwardneal
authored
Merged PoolWaitHandles, DbConnectionPoolIdentity, removed DbBuffer (#2390)
1 parent 85b9407 commit 6d33e9d

File tree

10 files changed

+112
-1229
lines changed

10 files changed

+112
-1229
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs">
124124
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs</Link>
125125
</Compile>
126+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs">
127+
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs</Link>
128+
</Compile>
126129
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs">
127130
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs</Link>
128131
</Compile>
@@ -634,8 +637,6 @@
634637
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionFactory.cs" />
635638
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionInternal.cs" />
636639
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPool.cs" />
637-
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPool.NetCoreApp.cs" />
638-
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
639640
<Compile Include="Microsoft\Data\SqlClient\AAsyncCallContext.cs" />
640641
<Compile Include="Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs" />
641642
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.cs" />
@@ -839,6 +840,9 @@
839840
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Windows.cs">
840841
<Link>Microsoft\Data\Common\AdapterUtil.Windows.cs</Link>
841842
</Compile>
843+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs">
844+
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs</Link>
845+
</Compile>
842846
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs">
843847
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs</Link>
844848
</Compile>
@@ -856,7 +860,6 @@
856860
</Compile>
857861

858862
<Compile Include="Interop\SNINativeMethodWrapper.Windows.cs" />
859-
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs" />
860863
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.Common.cs" />
861864
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.Windows.cs" />
862865
<Compile Include="Microsoft\Data\SqlClient\PacketHandle.Windows.cs" />
@@ -909,9 +912,11 @@
909912
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Unix.cs">
910913
<Link>Microsoft\Data\Common\AdapterUtil.Unix.cs</Link>
911914
</Compile>
915+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs">
916+
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs</Link>
917+
</Compile>
912918

913919
<Compile Include="Interop\SNINativeMethodWrapper.Unix.cs" />
914-
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
915920
<Compile Include="Microsoft\Data\Sql\SqlDataSourceEnumerator.Unix.cs" />
916921
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.Unix.cs" />
917922
<Compile Include="Microsoft\Data\SqlClient\PacketHandle.Unix.cs" />

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.NetCoreApp.cs‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace Microsoft.Data.ProviderBase
1717
{
18-
sealed internal partial class DbConnectionPool
18+
internal sealed class DbConnectionPool
1919
{
2020
private enum State
2121
{
@@ -1763,5 +1763,39 @@ private DbConnectionInternal UserCreateRequest(DbConnection owningObject, DbConn
17631763
return obj;
17641764
}
17651765
}
1766+
1767+
#if NET6_0_OR_GREATER
1768+
private bool IsBlockingPeriodEnabled()
1769+
{
1770+
var poolGroupConnectionOptions = _connectionPoolGroup.ConnectionOptions as SqlConnectionString;
1771+
if (poolGroupConnectionOptions == null)
1772+
{
1773+
return true;
1774+
}
1775+
var policy = poolGroupConnectionOptions.PoolBlockingPeriod;
1776+
1777+
switch (policy)
1778+
{
1779+
case PoolBlockingPeriod.Auto:
1780+
{
1781+
return !ADP.IsAzureSqlServerEndpoint(poolGroupConnectionOptions.DataSource);
1782+
}
1783+
case PoolBlockingPeriod.AlwaysBlock:
1784+
{
1785+
return true; //Enabled
1786+
}
1787+
case PoolBlockingPeriod.NeverBlock:
1788+
{
1789+
return false; //Disabled
1790+
}
1791+
default:
1792+
{
1793+
//we should never get into this path.
1794+
Debug.Fail("Unknown PoolBlockingPeriod. Please specify explicit results in above switch case statement.");
1795+
return true;
1796+
}
1797+
}
1798+
}
1799+
#endif
17661800
}
17671801
}

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@
147147
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs">
148148
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs</Link>
149149
</Compile>
150+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs">
151+
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs</Link>
152+
</Compile>
153+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs">
154+
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs</Link>
155+
</Compile>
150156
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs">
151157
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs</Link>
152158
</Compile>
@@ -662,13 +668,11 @@
662668
<Compile Include="Microsoft\Data\Interop\SNINativeManagedWrapperX64.cs" />
663669
<Compile Include="Microsoft\Data\Interop\SNINativeManagedWrapperX86.cs" />
664670
<Compile Include="Microsoft\Data\Interop\SNINativeMethodWrapper.cs" />
665-
<Compile Include="Microsoft\Data\ProviderBase\DbBuffer.cs" />
666671
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionClosed.cs" />
667672
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionFactory.cs" />
668673
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionInternal.cs" />
669674
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPool.cs" />
670675
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolCounters.cs" />
671-
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
672676
<Compile Include="Microsoft\Data\RelationshipConverter.cs" />
673677
<Compile Include="Microsoft\Data\SqlClient\assemblycache.cs" />
674678
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.cs" />

0 commit comments

Comments
 (0)