Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion frameworks/CSharp/aspnetcore/appsettings.postgresql.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"ConnectionString": "Server=tfb-database;Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;SSL Mode=Disable;Maximum Pool Size=512;NoResetOnClose=true;Enlist=false;Max Auto Prepare=4",
"ConnectionString": "Server=tfb-database;Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;SSL Mode=Disable;Maximum Pool Size=18;Enlist=false;Max Auto Prepare=4;Multiplexing=true;Write Coalescing Buffer Threshold Bytes=1000;",
"Database": "postgresql"
}
4 changes: 2 additions & 2 deletions frameworks/CSharp/aspnetcore/aspnetcore-aot.dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
RUN apt-get update
RUN apt-get -yqq install clang zlib1g-dev
WORKDIR /app
COPY src/Platform .
RUN dotnet publish -c Release -o out /p:DatabaseProvider=Npgsql /p:PublishAot=true /p:OptimizationPreference=Speed /p:GarbageCollectionAdaptationMode=0

FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
ENV URLS=http://+:8080

WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions frameworks/CSharp/aspnetcore/aspnetcore-minimal.dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
WORKDIR /app
COPY src/Minimal .
RUN dotnet publish -c Release -o out

FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
ENV URLS http://+:8080
ENV DOTNET_GCDynamicAdaptationMode=0
ENV DOTNET_ReadyToRun=0
Expand Down
4 changes: 2 additions & 2 deletions frameworks/CSharp/aspnetcore/aspnetcore-mvc.dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
WORKDIR /app
COPY src/Mvc .
RUN dotnet publish -c Release -o out

FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
ENV URLS http://+:8080
ENV DOTNET_GCDynamicAdaptationMode=0
ENV DOTNET_ReadyToRun=0
Expand Down
4 changes: 2 additions & 2 deletions frameworks/CSharp/aspnetcore/aspnetcore-mysql.dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
WORKDIR /app
COPY src/Platform .
RUN dotnet publish -c Release -o out /p:DatabaseProvider=MySqlConnector

FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
ENV URLS http://+:8080
ENV DOTNET_GCDynamicAdaptationMode=0
ENV DOTNET_ReadyToRun=0
Expand Down
4 changes: 2 additions & 2 deletions frameworks/CSharp/aspnetcore/aspnetcore.dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
WORKDIR /app
COPY src/Platform .
RUN dotnet publish -c Release -o out /p:DatabaseProvider=Npgsql

FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
ENV URLS=http://+:8080
ENV DOTNET_GCDynamicAdaptationMode=0
ENV DOTNET_ReadyToRun=0
Expand Down
24 changes: 21 additions & 3 deletions frameworks/CSharp/aspnetcore/src/Minimal/Database/Db.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ public async Task<World[]> LoadMultipleUpdatesRows(string? parameter)

var parameters = new Dictionary<string, object>();

var ids = new int[count];
var numbers = new int[count];

await using var db = _dbProviderFactory.CreateConnection();

db!.ConnectionString = _connectionString;
Expand All @@ -72,18 +75,33 @@ public async Task<World[]> LoadMultipleUpdatesRows(string? parameter)
for (var i = 0; i < count; i++)
{
results[i] = await ReadSingleRow(db);
ids[i] = results[i].Id;
}
Array.Sort(ids);

// Ensure unique ids by incrementing duplicates
for (var i = 1; i < count; i++)
if (ids[i] == ids[i - 1])
ids[i] = (ids[i] % 10000) + 1;

for (var i = 0; i < count; i++)
{
var randomNumber = Random.Shared.Next(1, 10001);
parameters[$"@Rn_{i}"] = randomNumber;
parameters[$"@Id_{i}"] = results[i].Id;
if (results[i].RandomNumber == randomNumber)
{
randomNumber = (randomNumber % 10000) + 1;
}

results[i].RandomNumber = randomNumber;
numbers[i] = randomNumber;
}

await db.ExecuteAsync(BatchUpdateString.Query(count), parameters);
var update = "UPDATE world w SET randomnumber = u.new_val FROM (SELECT unnest(@ids) as id, unnest(@newValues) as new_val) u WHERE w.id = u.id";

parameters["ids"] = ids;
parameters["newValues"] = numbers;

await db.ExecuteAsync(update, parameters);
return results;
}

Expand Down
8 changes: 4 additions & 4 deletions frameworks/CSharp/aspnetcore/src/Minimal/Minimal.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<UserSecretsId>38063504-d08c-495a-89c9-daaad2f60f31</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Npgsql" Version="9.0.2" />
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="RazorSlices" Version="0.8.1" />
<PackageReference Include="Npgsql" Version="10.0.0" />
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="RazorSlices" Version="0.9.5" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions frameworks/CSharp/aspnetcore/src/Mvc/Mvc.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<UserSecretsId>574ff97c-fe74-4b0d-af25-8d7200a036f5</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Npgsql" Version="9.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
<PackageReference Include="Npgsql" Version="10.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
</ItemGroup>

</Project>
31 changes: 0 additions & 31 deletions frameworks/CSharp/aspnetcore/src/Platform/Data/Random.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@ namespace PlatformBenchmarks;
// If you are changing RawDbMySqlConnector.cs, also consider changing RawDbNpgsql.cs.
public sealed class RawDb
{
private readonly ConcurrentRandom _random;
private readonly string _connectionString;
private readonly MemoryCache _cache
= new(new MemoryCacheOptions { ExpirationScanFrequency = TimeSpan.FromMinutes(60) });

private readonly MySqlDataSource _dataSource;

public RawDb(ConcurrentRandom random, AppSettings appSettings)
public RawDb(AppSettings appSettings)
{
_random = random;
_connectionString = appSettings.ConnectionString;
_dataSource = new MySqlDataSource(appSettings.ConnectionString);
}
Expand All @@ -46,10 +44,10 @@ public Task<CachedWorld[]> LoadCachedQueries(int count)
var result = new CachedWorld[count];
var cacheKeys = _cacheKeys;
var cache = _cache;
var random = _random;

for (var i = 0; i < result.Length; i++)
{
var id = random.Next(1, 10001);
var id = Random.Shared.Next(1, 10001);
var key = cacheKeys[id];
if (cache.TryGetValue(key, out var cached))
{
Expand Down Expand Up @@ -80,7 +78,7 @@ static async Task<CachedWorld[]> LoadUncachedQueries(int id, int i, int count, R
{
result[i] = await rawdb._cache.GetOrCreateAsync(key, create);

id = rawdb._random.Next(1, 10001);
id = Random.Shared.Next(1, 10001);
idParameter.Value = id;
key = cacheKeys[id];
}
Expand Down Expand Up @@ -117,24 +115,18 @@ public async Task<World[]> LoadMultipleQueriesRows(int count)

using var connection = await _dataSource.OpenConnectionAsync();

using var batch = new MySqlBatch(connection);

for (var i = 0; i < count; i++)
// It is not acceptable to execute multiple SELECTs within a single complex query.
// It is not acceptable to retrieve all required rows using a SELECT ... WHERE id IN (...) clause.
// Pipelining of network traffic between the application and database is permitted.

var (queryCmd, queryParameter) = await CreateReadCommandAsync(connection);
using (queryCmd)
{
batch.BatchCommands.Add(new MySqlBatchCommand()
for (var i = 0; i < results.Length; i++)
{
CommandText = "SELECT id, randomnumber FROM world WHERE id = @id",
Parameters = { new MySqlParameter("@id", _random.Next(1, 10001)) }
});
}

using var reader = await batch.ExecuteReaderAsync();

for (var i = 0; i < count; i++)
{
await reader.ReadAsync();
results[i] = new World { Id = reader.GetInt32(0), RandomNumber = reader.GetInt32(1) };
await reader.NextResultAsync();
queryParameter.Value = Random.Shared.Next(1, 10001);
results[i] = await ReadSingleRow(queryCmd);
}
}

return results;
Expand All @@ -144,23 +136,34 @@ public async Task<World[]> LoadMultipleUpdatesRows(int count)
{
var results = new World[count];

var ids = new int[count];
for (var i = 0; i < count; i++)
{
ids[i] = Random.Shared.Next(1, 10001);
}
Array.Sort(ids);

using var connection = await _dataSource.OpenConnectionAsync();

// Each row must be selected randomly using one query in the same fashion as the single database query test
// Use of IN clauses or similar means to consolidate multiple queries into one operation is not permitted.
// Similarly, use of a batch or multiple SELECTs within a single statement are not permitted
var (queryCmd, queryParameter) = await CreateReadCommandAsync(connection);
using (queryCmd)
{
for (var i = 0; i < results.Length; i++)
{
queryParameter.Value = ids[i];
results[i] = await ReadSingleRow(queryCmd);
queryParameter.Value = _random.Next(1, 10001);
}
}

// MySql doesn't have the unnest function like PostgreSQL, so we have to do a batch update instead
using (var updateCmd = new MySqlCommand(BatchUpdateString.Query(count), connection))
{
for (var i = 0; i < results.Length; i++)
{
var randomNumber = _random.Next(1, 10001);
var randomNumber = Random.Shared.Next(1, 10001);

updateCmd.Parameters.AddWithValue($"@Id_{i}", results[i].Id);
updateCmd.Parameters.AddWithValue($"@Random_{i}", randomNumber);
Expand Down Expand Up @@ -204,7 +207,7 @@ public async Task<List<FortuneUtf16>> LoadFortunesRows()
private async Task<(MySqlCommand readCmd, MySqlParameter idParameter)> CreateReadCommandAsync(MySqlConnection connection)
{
var cmd = new MySqlCommand("SELECT id, randomnumber FROM world WHERE id = @Id", connection);
var parameter = new MySqlParameter("@Id", _random.Next(1, 10001));
var parameter = new MySqlParameter("@Id", Random.Shared.Next(1, 10001));

cmd.Parameters.Add(parameter);

Expand Down
Loading
Loading