Skip to content
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

Jump to bottom

Share SqlStatistics #1028

Merged
merged 5 commits into from
May 7, 2021
Merged

Share SqlStatistics #1028

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc98554
move netcore SqlStatistics to shared
Wraith2 Apr 11, 2021
ee5f24c
add ValueSqlStatisticsScope and static factory method
Wraith2 Apr 11, 2021
f68f1f6
style cleanup and comment clarification
Wraith2 Apr 11, 2021
d320c29
fixup netfx strings and GetHashcode() calls
Wraith2 Apr 11, 2021
3fef92f
restore resx project settings
Wraith2 Apr 28, 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 @@ -489,7 +489,9 @@
<Compile Include="Microsoft\Data\SqlClient\SqlReferenceCollection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlStatistics.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStatistics.cs">
<Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlUdtInfo.cs" />
Expand Down
10 changes: 6 additions & 4 deletions 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 @@ -477,7 +477,9 @@
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStreamSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReaderSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlStatistics.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStatistics.cs">
<Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlUdtInfo.cs" />
Expand Down Expand Up @@ -540,10 +542,10 @@
</ItemGroup>
<!-- Resources -->
<ItemGroup>
<Compile Include="Resources\$(ResxFileName).Designer.cs">
<Compile Include="Resources\Strings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>$(ResxFileName).resx</DependentUpon>
<DependentUpon>Strings.resx</DependentUpon>
Wraith2 marked this conversation as resolved.
Show resolved Hide resolved
</Compile>
<Compile Include="Resources\$(ResxFileName)Helper.cs" />
<EmbeddedResource Include="Resources\$(ResxFileName).resx">
Expand Down Expand Up @@ -602,4 +604,4 @@
<Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2869,11 +2869,11 @@ public IDictionary RetrieveStatistics()
if (null != Statistics)
{
UpdateStatistics();
return Statistics.GetHashtable();
return Statistics.GetDictionary();
}
else
{
return new SqlStatistics().GetHashtable();
return new SqlStatistics().GetDictionary();
}
}

Expand Down
221 changes: 0 additions & 221 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlStatistics.cs
View file
Open in desktop

This file was deleted.

36 changes: 36 additions & 0 deletions src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4617,4 +4617,16 @@
<data name="SqlRetryLogic_InvalidMinMaxPair" xml:space="preserve">
<value>'{0}' is not less than '{1}'; '{2}' cannot be greater than '{3}'.</value>
</data>
</root>
<data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
<value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
</data>
<data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
<value>Only single dimensional arrays are supported for the requested action.</value>
</data>
<data name="Arg_RemoveArgNotFound" xml:space="preserve">
<value>Cannot remove the specified item because it was not found in the specified Collection.</value>
</data>
<data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
<value>Non-negative number required.</value>
</data>
</root>
Loading