Skip to content

Move to Shared for SqlConnectionPoolKey.cs #1292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Oct 18, 2021
Merged

Move to Shared for SqlConnectionPoolKey.cs #1292

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0be5325
Merge changes from netfx of SqlConnectionPoolKey into netcore version
lcheunglci Sep 27, 2021
4d1f095
Fix compiler error for netfx build when referencing the merged SqlCon…
lcheunglci Sep 27, 2021
dc2c90b
Move the SqlConnectionPoolKey.cs from netcore to shared src and updat…
lcheunglci Sep 27, 2021
1143700
Move the compile include for SqlConnectionPoolKey.cs in the correct l…
lcheunglci Sep 27, 2021
895eb17
Update file to conform with coding style cleaning up IDE0044 and IDE0019
lcheunglci Sep 27, 2021
167b8de
Merge branch 'dotnet:main' into MergeShared-SqlConnectionPoolKey
lcheunglci Sep 28, 2021
f2cf2c4
Revise the ifdef in the Equals method in SqlConnectionPoolKey
lcheunglci Sep 28, 2021
8037629
Merge branch 'dotnet:main' into MergeShared-SqlConnectionPoolKey
lcheunglci Sep 29, 2021
1630bbf
Renamed the shared src SqlConnectionPoolKey.cs to SqlConnectionPoolKe…
lcheunglci Oct 4, 2021
4599f5e
Merge branch 'main' into MergeShared-SqlConnectionPoolKey
lcheunglci Oct 4, 2021
57da38b
Merge the netfx and netcore versions of SqlConnectionPoolKey.cs back …
lcheunglci Oct 6, 2021
1b2bad5
Rename SqlConnectionPoolKey.Common.cs in shared src to SqlConnectionP…
lcheunglci Oct 6, 2021
ed19eb1
Merge branch 'main' into MergeShared-SqlConnectionPoolKey
lcheunglci Oct 6, 2021
81891e9
Resolve merge conflict
lcheunglci Oct 6, 2021
71aef5f
Revise changes based on comments restore original approach forthe met…
lcheunglci Oct 7, 2021
1dd6a08
Remove the unused namespace
lcheunglci Oct 7, 2021
5f537d0
Resolve merge conflict due to the csprojs
lcheunglci Oct 14, 2021
b633b40
Merge branch 'main' into MergeShared-SqlConnectionPoolKey
lcheunglci Oct 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCommandSet.cs">
<Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -505,7 +508,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionString.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">
Expand Down
97 changes: 0 additions & 97 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionPoolKey.cs
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCommandSet.cs">
<Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -472,7 +475,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionString.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">
Expand Down
157 changes: 90 additions & 67 deletions ...ft/Data/SqlClient/SqlConnectionPoolKey.cs → ...ft/Data/SqlClient/SqlConnectionPoolKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,13 @@ namespace Microsoft.Data.SqlClient
{
// SqlConnectionPoolKey: Implementation of a key to connection pool groups for specifically to be used for SqlConnection
// Connection string and SqlCredential are used as a key
internal class SqlConnectionPoolKey : DbConnectionPoolKey, ICloneable
internal class SqlConnectionPoolKey : DbConnectionPoolKey
{
private SqlCredential _credential;
private int _hashValue;
private readonly SqlCredential _credential;
private readonly string _accessToken;
private ServerCertificateValidationCallback _serverCertificateValidationCallback;
private ClientCertificateRetrievalCallback _clientCertificateRetrievalCallback;
private SqlClientOriginalNetworkAddressInfo _originalNetworkAddressInfo;

internal SqlConnectionPoolKey(string connectionString,
SqlCredential credential,
string accessToken,
ServerCertificateValidationCallback serverCertificateValidationCallback,
ClientCertificateRetrievalCallback clientCertificateRetrievalCallback,
SqlClientOriginalNetworkAddressInfo originalNetworkAddressInfo) : base(connectionString)
{
Debug.Assert(_credential == null || _accessToken == null, "Credential and AccessToken can't have the value at the same time.");
_credential = credential;
_accessToken = accessToken;
_serverCertificateValidationCallback = serverCertificateValidationCallback;
_clientCertificateRetrievalCallback = clientCertificateRetrievalCallback;
_originalNetworkAddressInfo = originalNetworkAddressInfo;
CalculateHashCode();
}

private SqlConnectionPoolKey(SqlConnectionPoolKey key) : base(key)
{
_credential = key.Credential;
_accessToken = key.AccessToken;
_serverCertificateValidationCallback = key._serverCertificateValidationCallback;
_clientCertificateRetrievalCallback = key._clientCertificateRetrievalCallback;
CalculateHashCode();
}

object ICloneable.Clone()
public override object Clone()
{
return new SqlConnectionPoolKey(this);
}
Expand All @@ -63,13 +35,7 @@ internal override string ConnectionString
}
}

internal SqlCredential Credential
{
get
{
return _credential;
}
}
internal SqlCredential Credential => _credential;

internal string AccessToken
{
Expand All @@ -79,49 +45,62 @@ internal string AccessToken
}
}

internal ServerCertificateValidationCallback ServerCertificateValidationCallback
public override int GetHashCode()
{
get
{
return _serverCertificateValidationCallback;
}
return _hashValue;
}

internal ClientCertificateRetrievalCallback ClientCertificateRetrievalCallback
#if NETFRAMEWORK
private readonly ServerCertificateValidationCallback _serverCertificateValidationCallback;
private readonly ClientCertificateRetrievalCallback _clientCertificateRetrievalCallback;
private readonly SqlClientOriginalNetworkAddressInfo _originalNetworkAddressInfo;

private SqlConnectionPoolKey(SqlConnectionPoolKey key) : base(key)
{
get
{
return _clientCertificateRetrievalCallback;
}
_credential = key.Credential;
_accessToken = key.AccessToken;
_serverCertificateValidationCallback = key._serverCertificateValidationCallback;
_clientCertificateRetrievalCallback = key._clientCertificateRetrievalCallback;
CalculateHashCode();
}

internal SqlClientOriginalNetworkAddressInfo OriginalNetworkAddressInfo
internal SqlConnectionPoolKey(string connectionString,
SqlCredential credential,
string accessToken,
ServerCertificateValidationCallback serverCertificateValidationCallback,
ClientCertificateRetrievalCallback clientCertificateRetrievalCallback,
SqlClientOriginalNetworkAddressInfo originalNetworkAddressInfo) : base(connectionString)
{
get
{
return _originalNetworkAddressInfo;
}
Debug.Assert(_credential == null || _accessToken == null, "Credential and AccessToken can't have the value at the same time.");
_credential = credential;
_accessToken = accessToken;
_serverCertificateValidationCallback = serverCertificateValidationCallback;
_clientCertificateRetrievalCallback = clientCertificateRetrievalCallback;
_originalNetworkAddressInfo = originalNetworkAddressInfo;
CalculateHashCode();
}

public override bool Equals(object obj)
{
SqlConnectionPoolKey key = obj as SqlConnectionPoolKey;

return (key != null &&
_credential == key._credential &&
ConnectionString == key.ConnectionString &&
string.CompareOrdinal(_accessToken, key._accessToken) == 0 &&
_serverCertificateValidationCallback == key._serverCertificateValidationCallback &&
_clientCertificateRetrievalCallback == key._clientCertificateRetrievalCallback &&
_originalNetworkAddressInfo == key._originalNetworkAddressInfo);
return (obj is SqlConnectionPoolKey key
&& _credential == key._credential
&& ConnectionString == key.ConnectionString
&& string.CompareOrdinal(_accessToken, key._accessToken) == 0
&& _serverCertificateValidationCallback == key._serverCertificateValidationCallback
&& _clientCertificateRetrievalCallback == key._clientCertificateRetrievalCallback
&& _originalNetworkAddressInfo == key._originalNetworkAddressInfo);
}

public override int GetHashCode()
{
return _hashValue;
}
internal ServerCertificateValidationCallback ServerCertificateValidationCallback
=> _serverCertificateValidationCallback;

internal ClientCertificateRetrievalCallback ClientCertificateRetrievalCallback
=> _clientCertificateRetrievalCallback;

internal SqlClientOriginalNetworkAddressInfo OriginalNetworkAddressInfo
=> _originalNetworkAddressInfo;

private void CalculateHashCode()
internal void CalculateHashCode()
{
_hashValue = base.GetHashCode();

Expand All @@ -148,5 +127,49 @@ private void CalculateHashCode()
}
}
}
#else
private SqlConnectionPoolKey(SqlConnectionPoolKey key) : base(key)
{
_credential = key.Credential;
_accessToken = key.AccessToken;
CalculateHashCode();
}

internal SqlConnectionPoolKey(string connectionString, SqlCredential credential, string accessToken) : base(connectionString)
{
Debug.Assert(_credential == null || _accessToken == null, "Credential and AccessToken can't have the value at the same time.");
_credential = credential;
_accessToken = accessToken;
CalculateHashCode();
}

public override bool Equals(object obj)
{
return (obj is SqlConnectionPoolKey key
&& _credential == key._credential
&& ConnectionString == key.ConnectionString
&& string.CompareOrdinal(_accessToken, key._accessToken) == 0);
}

internal void CalculateHashCode()
{
_hashValue = base.GetHashCode();

if (_credential != null)
{
unchecked
{
_hashValue = _hashValue * 17 + _credential.GetHashCode();
}
}
else if (_accessToken != null)
{
unchecked
{
_hashValue = _hashValue * 17 + _accessToken.GetHashCode();
}
}
}
#endif // NETFRAMEWORK
}
}