8000 Merge | SqlConfigurableRetryLogicLoader (#3246) · dotnet/SqlClient@b2ee435 · GitHub
[go: up one dir, main page]
Skip to content

Commit b2ee435

Browse files
benrr101benrr101
authored
Merge | SqlConfigurableRetryLogicLoader (#3246)
* Split out classes/interfaces from SqlConfigurableRetryLogicManager.cs * Roll SqlConfigurableRetryLogicManager.NetCoreApp.cs into SqlConfigurableRetryLogicLoader class * Roll netfx SqlConfigurableRetryLogicManager.LoadType.cs into SqlConfigurableRetryLogicLoader
1 parent 41b9345 commit b2ee435

File tree

9 files changed

+198
-176
lines changed

9 files changed

+198
-176
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,15 @@
272272
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs">
273273
<Link>Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs</Link>
274274
</Compile>
275+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs">
276+
<Link>Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs</Link>
277+
</Compile>
278+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs">
279+
<Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs</Link>
280+
</Compile>
281+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs">
282+
<Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs</Link>
283+
</Compile>
275284
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs">
276285
<Link>Microsoft\Data\SqlClient\Reliability\SqlRetryingEventArgs.cs</Link>
277286
</Compile>
@@ -699,7 +708,6 @@
699708
<Compile Include="Common\System\NotImplemented.cs" />
700709
<Compile Include="Common\System\Threading\Tasks\TaskToApm.cs" />
701710
<Compile Include="Microsoft\ 8000 Data\Common\DbConnectionOptions.cs" />
702-
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.NetCoreApp.cs" />
703711
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
704712
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIError.cs" />
705713
<Compile Include="Microsoft\Data\SqlClient\SNI\SNICommon.cs" />

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicManager.NetCoreApp.cs

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

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,15 @@
445445
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs">
446446
<Link>Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs</Link>
447447
</Compile>
448+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs">
449+
<Link>Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs</Link>
450+
</Compile>
451+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs">
452+
<Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs</Link>
453+
</Compile>
454+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs">
455+
<Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs</Link>
456+
</Compile>
448457
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs">
449458
<Link>Microsoft\Data\SqlClient\Reliability\SqlRetryingEventArgs.cs</Link>
450459
</Compile>
@@ -864,7 +873,6 @@
864873
<Compile Include="Microsoft\Data\Common\DbConnectionString.cs" />
865874
<Compile Include="Microsoft\Data\Common\GreenMethods.cs" />
866875
<Compile Include="Microsoft\Data\SqlClient\BufferWriterExtensions.cs" />
867-
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.LoadType.cs" />
868876
<Compile Include="Microsoft\Data\SqlClient\Server\SmiConnection.cs" />
869877
<Compile Include="Microsoft\Data\SqlClient\Server\SmiContext.cs" />
870878
<Compile Include="Microsoft\Data\SqlClient\Server\SmiContextFactory.cs" />

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicManager.LoadType.cs

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

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/IAppContextSwitchOverridesSection.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
namespace Microsoft.Data.SqlClient
6+
{
7+
internal interface IAppContextSwitchOverridesSection
8+
{
9+
string Value { get; set; }
10+
}
11+
}

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/ISqlConfigurableRetryCommandSection.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
namespace Microsoft.Data.SqlClient
6+
{
7+
internal interface ISqlConfigurableRetryCommandSection : ISqlConfigurableRetryConnectionSection
8+
{
9+
string AuthorizedSqlCondition { get; set; }
10+
}
11+
}

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/ISqlConfigurableRetryConnectionSection.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System;
6+
7+
namespace Microsoft.Data.SqlClient
8+
{
9+
internal interface ISqlConfigurableRetryConnectionSection
10+
{
11+
TimeSpan DeltaTime { get; set; }
12+
13+
TimeSpan MaxTimeInterval { get; set; }
14+
15+
TimeSpan MinTimeInterval { get; set; }
16+
17+
int NumberOfTries { get; set; }
18+
19+
string RetryLogicType { get; set; }
20+
21+
string RetryMethod { get; set; }
22+
23+
string TransientErrors { get; set; }
24+
}
25+
}

0 commit comments

Comments
 (0)
0