Skip to content

Commit 83993ea

Browse files
rojiroji
committed
Tweaks to align with latest TechEmpower platform benchmark code
1 parent 34796da commit 83993ea

File tree

9 files changed

+33
-42
lines changed

9 files changed

+33
-42
lines changed

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,8 @@ private enum State
252252
}
253253

254254
[MethodImpl(MethodImplOptions.AggressiveInlining)]
255-
private static BufferWriter<WriterAdapter> GetWriter(PipeWriter pipeWriter, int sizeHint) => new(new(pipeWriter), sizeHint);
255+
private static BufferWriter<WriterAdapter> GetWriter(PipeWriter pipeWriter, int sizeHint)
256+
=> new(new(pipeWriter), sizeHint);
256257

257258
[MethodImpl(MethodImplOptions.AggressiveInlining)]
258259
private static ChunkedBufferWriter<WriterAdapter> GetChunkedWriter(PipeWriter pipeWriter, int chunkSizeHint)
@@ -290,7 +291,7 @@ public ParsingAdapter(BenchmarkApplication requestHandler)
290291
=> RequestHandler = requestHandler;
291292

292293
public void OnStaticIndexedHeader(int index)
293-
=> RequestHandler.OnStaticIndexedHeader(index);
294+
=> RequestHandler.OnStaticIndexedHeader(index);
294295

295296
public void OnStaticIndexedHeader(int index, ReadOnlySpan<byte> value)
296297
=> RequestHandler.OnStaticIndexedHeader(index, value);

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/BenchmarkApplication.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public bool Return(ChunkedBufferWriter<WriterAdapter> writer)
5555
}
5656
}
5757

58-
private readonly static SliceFactory<List<Fortune>> FortunesTemplateFactory = RazorSlice.ResolveSliceFactory<List<Fortune>>("/Templates/Fortunes.cshtml");
59-
private readonly static SliceFactory<List<FortuneDapper>> FortunesDapperTemplateFactory = RazorSlice.ResolveSliceFactory<List<FortuneDapper>>("/Templates/FortunesDapper.cshtml");
58+
private readonly static SliceFactory<List<FortuneUtf8>> FortunesTemplateFactory = RazorSlice.ResolveSliceFactory<List<FortuneUtf8>>("/Templates/FortunesUtf8.cshtml");
59+
private readonly static SliceFactory<List<FortuneUtf16>> FortunesDapperTemplateFactory = RazorSlice.ResolveSliceFactory<List<FortuneUtf16>>("/Templates/FortunesUtf16.cshtml");
6060
private readonly static SliceFactory<List<FortuneEf>> FortunesEfTemplateFactory = RazorSlice.ResolveSliceFactory<List<FortuneEf>>("/Templates/FortunesEf.cshtml");
6161

6262
[ThreadStatic]

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/BatchUpdateString.cs

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
2-
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
55
using System.Linq;
@@ -25,25 +25,15 @@ private static string CreateBatch(int batchSize)
2525
{
2626
var sb = StringBuilderCache.Acquire();
2727

28-
Func<int, string> paramNameGenerator = i => "$" + i;
29-
30-
sb.AppendLine("UPDATE world SET randomNumber = CASE id");
31-
for (var i = 0; i < batchSize * 2;)
32-
{
33-
sb.AppendLine($"when {paramNameGenerator(++i)} then {paramNameGenerator(++i)}");
34-
}
35-
sb.AppendLine("else randomnumber");
36-
sb.AppendLine("end");
37-
sb.Append("where id in (");
38-
for (var i = 1; i < batchSize * 2; i += 2)
28+
sb.Append("UPDATE world SET randomNumber = temp.randomNumber FROM (VALUES ");
29+
var c = 1;
30+
for (var i = 0; i < batchSize; i++)
3931
{
40-
sb.Append(paramNameGenerator(i));
41-
if (i < batchSize * 2 - 1)
42-
{
43-
sb.AppendLine(", ");
44-
}
32+
if (i > 0)
33+
sb.Append(", ");
34+
sb.Append($"(${c++}, ${c++})");
4535
}
46-
sb.Append(")");
36+
sb.Append(" ORDER BY 1) AS temp(id, randomNumber) WHERE temp.id = world.id");
4737

4838
return _queries[batchSize] = StringBuilderCache.GetStringAndRelease(sb);
4939
}

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/DapperDb.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ public class DapperDb
1313
public DapperDb(AppSettings appSettings)
1414
=> _connectionString = appSettings.ConnectionString;
1515

16-
public async Task<List<FortuneDapper>> LoadFortunesRows()
16+
public async Task<List<FortuneUtf16>> LoadFortunesRows()
1717
{
18-
List<FortuneDapper> result;
18+
List<FortuneUtf16> result;
1919

2020
using (var db = new NpgsqlConnection(_connectionString))
2121
{
2222
// Note: don't need to open connection if only doing one thing; let dapper do it
23-
result = (await db.QueryAsync<FortuneDapper>("SELECT id, message FROM fortune")).AsList();
23+
result = (await db.QueryAsync<FortuneUtf16>("SELECT id, message FROM fortune")).AsList();
2424
}
2525

26-
result.Add(new FortuneDapper(id: 0, message: "Additional fortune added at request time." ));
26+
result.Add(new FortuneUtf16(id: 0, message: "Additional fortune added at request time." ));
2727
result.Sort();
2828

2929
return result;

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/FortuneDapper.cs renamed to ‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/FortuneUtf16.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace PlatformBenchmarks
77
{
8-
public readonly struct FortuneDapper : IComparable<FortuneDapper>, IComparable
8+
public readonly struct FortuneUtf16 : IComparable<FortuneUtf16>, IComparable
99
{
10-
public FortuneDapper(int id, string message)
10+
public FortuneUtf16(int id, string message)
1111
{
1212
Id = id;
1313
Message = message;
@@ -20,6 +20,6 @@ public FortuneDapper(int id, string message)
2020
public int CompareTo(object obj) => throw new InvalidOperationException("The non-generic CompareTo should not be used");
2121

2222
// Performance critical, using culture insensitive comparison
23-
public int CompareTo(FortuneDapper other) => string.CompareOrdinal(Message, other.Message);
23+
public int CompareTo(FortuneUtf16 other) => string.CompareOrdinal(Message, other.Message);
2424
}
2525
}

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/Fortune.cs renamed to ‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/FortuneUtf8.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55

66
namespace PlatformBenchmarks
77
{
8-
public readonly struct Fortune : IComparable<Fortune>, IComparable
8+
public readonly struct FortuneUtf8 : IComparable<FortuneUtf8>, IComparable
99
{
10-
public Fortune(int id, byte[] message)
10+
public FortuneUtf8(int id, byte[] message)
1111
{
1212
Id = id;
13-
MessageUtf8 = message;
13+
Message = message;
1414
}
1515

1616
public int Id { get; }
1717

18-
public byte[] MessageUtf8 { get; }
18+
public byte[] Message { get; }
1919

2020
public int CompareTo(object obj) => throw new InvalidOperationException("The non-generic CompareTo should not be used");
2121

2222
// Performance critical, using culture insensitive comparison
23-
public int CompareTo(Fortune other) => MessageUtf8.AsSpan().SequenceCompareTo(other.MessageUtf8.AsSpan());
23+
public int CompareTo(FortuneUtf8 other) => Message.AsSpan().SequenceCompareTo(other.Message.AsSpan());
2424
}
2525
}

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/RawDb.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ public async Task<World[]> LoadMultipleUpdatesRows(int count)
233233
return results;
234234
}
235235

236-
public async Task<List<Fortune>> LoadFortunesRows()
236+
public async Task<List<FortuneUtf8>> LoadFortunesRows()
237237
{
238238
// Benchmark requirements explicitly prohibit pre-initializing the list size
239-
var result = new List<Fortune>();
239+
var result = new List<FortuneUtf8>();
240240

241241
using (var db = CreateConnection())
242242
{
@@ -247,15 +247,15 @@ public async Task<List<Fortune>> LoadFortunesRows()
247247

248248
while (await rdr.ReadAsync())
249249
{
250-
result.Add(new Fortune
250+
result.Add(new FortuneUtf8
251251
(
252252
id: rdr.GetInt32(0),
253253
message: rdr.GetFieldValue<byte[]>(1)
254254
));
255255
}
256256
}
257257

258-
result.Add(new Fortune(id: 0, AdditionalFortune));
258+
result.Add(new FortuneUtf8(id: 0, AdditionalFortune));
259259
result.Sort();
260260

261261
return result;

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Templates/FortunesDapper.cshtml renamed to ‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Templates/FortunesUtf16.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@inherits RazorSlice<List<FortuneDapper>>
1+
@inherits RazorSlice<List<FortuneUtf16>>
22
<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>@foreach (var item in Model){<tr><td>@item.Id</td><td>@item.Message</td></tr>}</table></body></html>

‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Templates/Fortunes.cshtml renamed to ‎src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Templates/FortunesUtf8.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@inherits RazorSlice<List<Fortune>>
2-
<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>@foreach (var item in Model){<tr><td>@item.Id</td><td>@item.MessageUtf8</td></tr>}</table></body></html>
1+
@inherits RazorSlice<List<FortuneUtf8>>
2+
<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>@foreach (var item in Model){<tr><td>@item.Id</td><td>@item.Message</td></tr>}</table></body></html>

0 commit comments

Comments
 (0)