Move to BlazorSSR project

DamianEdwards · DamianEdwards · commit 20301ed04d43 · 2024-12-18T16:27:15.000-08:00
diff --git a/src/BenchmarksApps/TechEmpower/BlazorSSR/Components/FortunesParameters.razor b/src/BenchmarksApps/TechEmpower/BlazorSSR/Components/FortunesParameters.razor
@@ -0,0 +1,19 @@
+﻿<!DOCTYPE html>
+<html>
+<head>
+    <title>Fortunes</title>
+</head>
+<body>
+    <table>
+        <tr><th>id</th><th>message</th></tr>
+        @foreach (var item in Rows)
+        {
+            <tr><td>@item.Id</td><td>@item.Message</td></tr>
+        }
+    </table>
+</body>
+</html>
+@code {
+    [Parameter]
+    public required List<Fortune> Rows { get; set; }
+}
diff --git a/src/BenchmarksApps/TechEmpower/BlazorSSR/Database/Db.cs b/src/BenchmarksApps/TechEmpower/BlazorSSR/Database/Db.cs
@@ -22,7 +22,7 @@ public async Task<List<Fortune>> LoadFortunesRowsDapper()
         await using var connection = _dataSource.CreateConnection();
         var result = (await connection.QueryAsync<Fortune>($"SELECT id, message FROM fortune")).AsList();
 
-        result.Add(new Fortune { Id = 0, Message = "Additional fortune added at request time." });
+        result.Add(new() { Id = 0, Message = "Additional fortune added at request time." });
         result.Sort(FortuneSortComparison);
 
         return result;
@@ -37,11 +37,36 @@ public async Task<List<Fortune>> LoadFortunesRowsEf(AppDbContext dbContext)
             result.Add(fortune);
         }
 
-        result.Add(new Fortune { Id = 0, Message = "Additional fortune added at request time." });
+        result.Add(new() { Id = 0, Message = "Additional fortune added at request time." });
         result.Sort(FortuneSortComparison);
 
         return result;
     }
 
+    public Task<List<Fortune>> LoadFortunesRowsNoDb()
+    {
+        // Benchmark requirements explicitly prohibit pre-initializing the list size
+        var result = new List<Fortune>
+        {
+            new() { Id = 1, Message = "fortune: No such file or directory" },
+            new() { Id = 2, Message = "A computer scientist is someone who fixes things that aren't broken." },
+            new() { Id = 3, Message = "After enough decimal places, nobody gives a damn." },
+            new() { Id = 4, Message = "A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1" },
+            new() { Id = 5, Message = "A computer program does what you tell it to do, not what you want it to do." },
+            new() { Id = 6, Message = "Emacs is a nice operating system, but I prefer UNIX. — Tom Christaensen" },
+            new() { Id = 7, Message = "Any program that runs right is obsolete." },
+            new() { Id = 8, Message = "A list is only as strong as its weakest link. — Donald Knuth" },
+            new() { Id = 9, Message = "Feature: A bug with seniority." },
+            new() { Id = 10, Message = "Computers make very fast, very accurate mistakes." },
+            new() { Id = 11, Message = "<script>alert(\"This should not be displayed in a browser alert box.\");</script>" },
+            new() { Id = 12, Message = "フレームワークのベンチマーク" },
+            new() { Id = 0, Message = "Additional fortune added at request time." }
+        };
+
+        result.Sort(FortuneSortComparison);
+
+        return Task.FromResult(result);
+    }
+
     ValueTask IAsyncDisposable.DisposeAsync() => _dataSource.DisposeAsync();
 }
diff --git a/src/BenchmarksApps/TechEmpower/BlazorSSR/FortunesRazorParameters.cs b/src/BenchmarksApps/TechEmpower/BlazorSSR/FortunesRazorParameters.cs
@@ -1,13 +1,13 @@
 ﻿using System.Collections;
 using System.Diagnostics.CodeAnalysis;
-using Minimal.Models;
-using Minimal.Templates;
+using BlazorSSR.Components;
+using BlazorSSR.Models;
 
-namespace Minimal;
+namespace BlazorSSR;
 
 internal readonly struct FortunesRazorParameters(List<Fortune> model) : IReadOnlyDictionary<string, object?>
 {
-    private const string ModelKeyName = nameof(FortunesRazor.Model);
+    private const string ModelKeyName = nameof(FortunesParameters.Rows);
 
     private readonly KeyValuePair<string, object?> _modelKvp = new(ModelKeyName, model);
 
diff --git a/src/BenchmarksApps/TechEmpower/BlazorSSR/Program.cs b/src/BenchmarksApps/TechEmpower/BlazorSSR/Program.cs
@@ -39,6 +39,18 @@
 app.MapGet("/direct/fortunes", () => new RazorComponentResult<Fortunes>());
 app.MapGet("/direct/fortunes-ef", () => new RazorComponentResult<FortunesEf>());
 
+app.MapGet("/direct/fortunes/params", async (HttpContext context, Db db) => {
+    var fortunes = await db.LoadFortunesRowsDapper();
+    //var fortunes = await db.LoadFortunesRowsNoDb(); // Don't call the database
+    var parameters = new Dictionary<string, object?> { { nameof(FortunesParameters.Rows), fortunes } };
+    //var parameters = new FortunesRazorParameters(fortunes); // Custom parameters class to avoid allocating a Dictionary
+    var result = new RazorComponentResult<FortunesParameters>(parameters)
+    {
+        PreventStreamingRendering = true
+    };
+    return result;
+});
+
 app.Lifetime.ApplicationStarted.Register(() => Console.WriteLine("Application started. Press Ctrl+C to shut down."));
 app.Lifetime.ApplicationStopping.Register(() => Console.WriteLine("Application is shutting down..."));
 
diff --git a/src/BenchmarksApps/TechEmpower/BlazorSSR/blazorssr.benchmarks.yml b/src/BenchmarksApps/TechEmpower/BlazorSSR/blazorssr.benchmarks.yml
@@ -51,6 +51,39 @@ scenarios:
         presetHeaders: html
         path: /fortunes-ef
 
+  fortunes-direct:
+    db:
+      job: postgresql
+    application:
+      job: blazorssr
+    load:
+      job: wrk
+      variables:
+        presetHeaders: html
+        path: /direct/fortunes
+
+  fortunes-direct-ef:
+    db:
+      job: postgresql
+    application:
+      job: blazorssr
+    load:
+      job: wrk
+      variables:
+        presetHeaders: html
+        path: /direct/fortunes-ef
+
+  fortunes-direct-params:
+    db:
+      job: postgresql
+    application:
+      job: blazorssr
+    load:
+      job: wrk
+      variables:
+        presetHeaders: html
+        path: /direct/fortunes/params
+
 profiles:
   # this profile uses the local folder as the source 
   # instead of the public repository
diff --git a/src/BenchmarksApps/TechEmpower/Minimal/Program.cs b/src/BenchmarksApps/TechEmpower/Minimal/Program.cs
@@ -22,7 +22,6 @@
 
 // Add services to the container.
 builder.Services.AddSingleton(new Db(appSettings));
-builder.Services.AddRazorComponents();
 builder.Services.AddSingleton(CreateHtmlEncoder());
 
 var app = builder.Build();
@@ -47,18 +46,6 @@
     return template;
 });
 
-app.MapGet("/fortunes/razor", async (HttpContext context, Db db) => {
-    var fortunes = await db.LoadFortunesRows();
-    //var fortunes = await db.LoadFortunesRowsNoDb(); // Don't call the database
-    var parameters = new Dictionary<string, object?> { { nameof(FortunesRazor.Model), fortunes } };
-    //var parameters = new FortunesRazorParameters(fortunes); // Custom parameters class to avoid allocating a Dictionary
-    var result = new RazorComponentResult<FortunesRazor>(parameters)
-    {
-        PreventStreamingRendering = true
-    };
-    return result;
-});
-
 app.MapGet("/queries/{count}", async (Db db, int count) => await db.LoadMultipleQueriesRows(count));
 
 app.MapGet("/queries/{count}/result", async (Db db, int count) => Results.Json(await db.LoadMultipleQueriesRows(count)));
diff --git a/src/BenchmarksApps/TechEmpower/Minimal/Templates/FortunesRazor.razor b/src/BenchmarksApps/TechEmpower/Minimal/Templates/FortunesRazor.razor
diff --git a/src/BenchmarksApps/TechEmpower/Minimal/Templates/_Imports.razor b/src/BenchmarksApps/TechEmpower/Minimal/Templates/_Imports.razor
diff --git a/src/BenchmarksApps/TechEmpower/Minimal/minimal.benchmarks.yml b/src/BenchmarksApps/TechEmpower/Minimal/minimal.benchmarks.yml
@@ -78,7 +78,7 @@ scenarios:
         presetHeaders: html
         path: /fortunes
 
-  fortunes_razor:
+  fortunes_result:
     db:
       job: postgresql
     application:
@@ -87,7 +87,7 @@ scenarios:
       job: wrk
       variables:
         presetHeaders: html
-        path: /fortunes/razor
+        path: /fortunes/result
 
   single_query:
     db:
