Unverified Commit f486848e authored by Nick Craver's avatar Nick Craver Committed by GitHub

Update benchmarks (#1451)

This fixes things for `netcoreapp3.1` and fixes the outstanding #1205.
parent 601a5c28
...@@ -14,6 +14,7 @@ public class MassiveBenchmarks : BenchmarkBase ...@@ -14,6 +14,7 @@ public class MassiveBenchmarks : BenchmarkBase
public void Setup() public void Setup()
{ {
BaseSetup(); BaseSetup();
RegisterSqlFactory();
_model = new DynamicModel(ConnectionString); _model = new DynamicModel(ConnectionString);
} }
......
...@@ -14,6 +14,7 @@ public class PetaPocoBenchmarks : BenchmarkBase ...@@ -14,6 +14,7 @@ public class PetaPocoBenchmarks : BenchmarkBase
public void Setup() public void Setup()
{ {
BaseSetup(); BaseSetup();
RegisterSqlFactory();
_db = new Database(ConnectionString, "System.Data.SqlClient"); _db = new Database(ConnectionString, "System.Data.SqlClient");
_db.OpenSharedConnection(); _db.OpenSharedConnection();
_dbFast = new Database(ConnectionString, "System.Data.SqlClient"); _dbFast = new Database(ConnectionString, "System.Data.SqlClient");
......
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Order;
using System; using System;
using System.Configuration; using System.Configuration;
using System.Data.SqlClient; using System.Data.SqlClient;
...@@ -22,6 +21,13 @@ protected void BaseSetup() ...@@ -22,6 +21,13 @@ protected void BaseSetup()
_connection.Open(); _connection.Open();
} }
protected void RegisterSqlFactory()
{
#if NETCOREAPP
System.Data.Common.DbProviderFactories.RegisterFactory("System.Data.SqlClient", SqlClientFactory.Instance);
#endif
}
protected void Step() protected void Step()
{ {
i++; i++;
......
...@@ -16,24 +16,24 @@ public class Config : ManualConfig ...@@ -16,24 +16,24 @@ public class Config : ManualConfig
public Config() public Config()
{ {
Add(ConsoleLogger.Default); AddLogger(ConsoleLogger.Default);
Add(CsvExporter.Default); AddExporter(CsvExporter.Default);
Add(MarkdownExporter.GitHub); AddExporter(MarkdownExporter.GitHub);
Add(HtmlExporter.Default); AddExporter(HtmlExporter.Default);
var md = MemoryDiagnoser.Default; var md = MemoryDiagnoser.Default;
Add(md); AddDiagnoser(md);
Add(new ORMColum()); AddColumn(new ORMColum());
Add(TargetMethodColumn.Method); AddColumn(TargetMethodColumn.Method);
Add(new ReturnColum()); AddColumn(new ReturnColum());
Add(StatisticColumn.Mean); AddColumn(StatisticColumn.Mean);
Add(StatisticColumn.StdDev); AddColumn(StatisticColumn.StdDev);
Add(StatisticColumn.Error); AddColumn(StatisticColumn.Error);
Add(BaselineRatioColumn.RatioMean); AddColumn(BaselineRatioColumn.RatioMean);
Add(DefaultColumnProviders.Metrics); AddColumnProvider(DefaultColumnProviders.Metrics);
Add(Job.ShortRun AddJob(Job.ShortRun
.WithLaunchCount(1) .WithLaunchCount(1)
.WithWarmupCount(2) .WithWarmupCount(2)
.WithUnrollFactor(Iterations) .WithUnrollFactor(Iterations)
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<ProjectReference Include="..\Dapper.Contrib\Dapper.Contrib.csproj" /> <ProjectReference Include="..\Dapper.Contrib\Dapper.Contrib.csproj" />
<PackageReference Include="Dashing" Version="2.2.0" /> <PackageReference Include="Dashing" Version="2.2.0" />
<PackageReference Include="Belgrade.Sql.Client" Version="1.1.4" /> <PackageReference Include="Belgrade.Sql.Client" Version="1.1.4" />
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" /> <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
<PackageReference Include="DevExpress.Xpo" Version="19.1.5" /> <PackageReference Include="DevExpress.Xpo" Version="19.1.5" />
<!--<PackageReference Include="BLToolkit" Version="4.3.6" />--> <!--<PackageReference Include="BLToolkit" Version="4.3.6" />-->
<PackageReference Include="EntityFramework" Version="6.3.0" /> <PackageReference Include="EntityFramework" Version="6.3.0" />
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<PackageReference Include="Npgsql" Version="4.0.9" /> <PackageReference Include="Npgsql" Version="4.0.9" />
<PackageReference Include="PetaPoco" Version="5.1.306" /> <PackageReference Include="PetaPoco" Version="5.1.306" />
<PackageReference Include="ServiceStack.OrmLite.SqlServer" Version="5.6.0" /> <PackageReference Include="ServiceStack.OrmLite.SqlServer" Version="5.6.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
<PackageReference Include="System.Data.SQLite" Version="1.0.111" /> <PackageReference Include="System.Data.SQLite" Version="1.0.111" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment