fixes the benchmark db schema and adds a json variant of params (#3321)

Robust.Benchmarks/Exporters/SQLExporter.cs

@@ -9,6 +9,7 @@ using System.Text.Json.Serialization;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Mathematics;
+using BenchmarkDotNet.Parameters;
 using BenchmarkDotNet.Reports;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
@@ -163,7 +164,10 @@ public class BenchmarkRun
 
     public string Name { get; set; } = string.Empty;
 
-    public string ParameterMapping { get; set; } = string.Empty;
+    public string? ParameterMapping { get; set; }
+
+    [Column(TypeName = "jsonb")]
+    public BenchmarkRunParameter[]? ParameterMappingJson { get; set; }
 
     [Column(TypeName = "jsonb")]
     public Statistics Statistics { get; set; } = default!;
@@ -176,12 +180,13 @@ public class BenchmarkRun
         foreach (var benchmarkReport in summary.Reports)
         {
             var paramString = new StringBuilder();
-            var parameters = benchmarkReport.BenchmarkCase.Parameters.Items;
-            for (var i = 0; i < parameters.Count; i++)
+            var parametersItems = benchmarkReport.BenchmarkCase.Parameters.Items;
+            var runParameters = new BenchmarkRunParameter[parametersItems.Count];
+            for (var i = 0; i < parametersItems.Count; i++)
             {
-                var parameter = parameters[i];
-                paramString.Append($"{parameter.Name}={parameter.Value}");
-                if (i < parameters.Count - 1) paramString.Append(',');
+                runParameters[i] = new BenchmarkRunParameter(parametersItems[i]);
+                paramString.Append(runParameters[i].ToString());
+                if (i < parametersItems.Count - 1) paramString.Append(',');
             }
 
             yield return new BenchmarkRun
@@ -189,9 +194,27 @@ public class BenchmarkRun
                 Name = name,
                 RunDate = runDate,
                 GitHash = gitHash,
-                ParameterMapping = paramString.ToString(),
+                ParameterMapping = runParameters.Length > 0 ? paramString.ToString() : null,
+                ParameterMappingJson = runParameters.Length > 0 ? runParameters : null,
                 Statistics = benchmarkReport.ResultStatistics ?? new Statistics()
             };
         }
     }
 }
+
+public struct BenchmarkRunParameter
+{
+    public string Name { get; set; } = string.Empty;
+    public object Value { get; set; } = default!;
+
+    public BenchmarkRunParameter(ParameterInstance instance)
+    {
+        Name = instance.Name;
+        Value = instance.Value;
+    }
+
+    public override string ToString()
+    {
+        return $"{Name}={Value}";
+    }
+}

Robust.Benchmarks/Migrations/20221010144620_param_work.Designer.cs

@@ -0,0 +1,64 @@
+// <auto-generated />
+using System;
+using BenchmarkDotNet.Mathematics;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Robust.Benchmarks.Exporters;
+
+#nullable disable
+
+namespace Robust.Benchmarks.Migrations
+{
+    [DbContext(typeof(BenchmarkContext))]
+    [Migration("20221010144620_param_work")]
+    partial class param_work
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Robust.Benchmarks.Exporters.BenchmarkRun", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GitHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ParameterMapping")
+                        .HasColumnType("text");
+
+                    b.Property<BenchmarkRunParameter[]>("ParameterMappingJson")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime>("RunDate")
+                        .HasColumnType("timestamptz");
+
+                    b.Property<Statistics>("Statistics")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("BenchmarkRuns");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Robust.Benchmarks/Migrations/20221010144620_param_work.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Robust.Benchmarks.Exporters;
+
+#nullable disable
+
+namespace Robust.Benchmarks.Migrations
+{
+    public partial class param_work : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "ParameterMapping",
+                table: "BenchmarkRuns",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AddColumn<BenchmarkRunParameter[]>(
+                name: "ParameterMappingJson",
+                table: "BenchmarkRuns",
+                type: "jsonb",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ParameterMappingJson",
+                table: "BenchmarkRuns");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ParameterMapping",
+                table: "BenchmarkRuns",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+        }
+    }
+}

Robust.Benchmarks/Migrations/BenchmarkContextModelSnapshot.cs

@@ -40,9 +40,11 @@ namespace Robust.Benchmarks.Migrations
                         .HasColumnType("text");
 
                     b.Property<string>("ParameterMapping")
-                        .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<BenchmarkRunParameter[]>("ParameterMappingJson")
+                        .HasColumnType("jsonb");
+
                     b.Property<DateTime>("RunDate")
                         .HasColumnType("timestamptz");
 

Robust.Benchmarks/Migrations/TypeIApparentlyHaveToKeep.cs

@@ -1,5 +1,6 @@
 using System;
 using BenchmarkDotNet.Mathematics;
+using Robust.Benchmarks.Exporters;
 
 namespace Robust.Benchmarks.Migrations;
 
@@ -8,9 +9,3 @@ public class BenchmarkRunReport
     public BenchmarkRunParameter[] Parameters { get; set; } = Array.Empty<BenchmarkRunParameter>();
     public Statistics Statistics { get; set; } = default!;
 }
-
-public class BenchmarkRunParameter
-{
-    public string Name { get; set; } = string.Empty;
-    public object Value { get; set; } = default!;
-}