Fix updates

sebastienros · sebastienros · commit c595296d9be8 · 2025-11-26T12:05:42.000-08:00
diff --git a/frameworks/CSharp/aspnetcore/src/Minimal/Database/Db.cs b/frameworks/CSharp/aspnetcore/src/Minimal/Database/Db.cs
@@ -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;
@@ -72,18 +75,24 @@ 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);
+
         for (var i = 0; i < count; i++)
         {
             var randomNumber = Random.Shared.Next(1, 10001);
-            parameters[$"@Rn_{i}"] = randomNumber;
-            parameters[$"@Id_{i}"] = results[i].Id;
-
             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;
     }
 
diff --git a/frameworks/CSharp/aspnetcore/src/Minimal/Minimal.csproj b/frameworks/CSharp/aspnetcore/src/Minimal/Minimal.csproj
@@ -9,9 +9,9 @@
   </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>
diff --git a/frameworks/CSharp/aspnetcore/src/Mvc/Mvc.csproj b/frameworks/CSharp/aspnetcore/src/Mvc/Mvc.csproj
@@ -9,8 +9,8 @@
   </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>
diff --git a/frameworks/CSharp/aspnetcore/src/Platform/Data/Random.cs b/frameworks/CSharp/aspnetcore/src/Platform/Data/Random.cs
diff --git a/frameworks/CSharp/aspnetcore/src/Platform/Data/RawDbMySqlConnector.cs b/frameworks/CSharp/aspnetcore/src/Platform/Data/RawDbMySqlConnector.cs
@@ -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);
     }
@@ -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))
             {
@@ -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];
             }
@@ -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;
@@ -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);
@@ -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);
 
diff --git a/frameworks/CSharp/aspnetcore/src/Platform/Data/RawDbNpgsql.cs b/frameworks/CSharp/aspnetcore/src/Platform/Data/RawDbNpgsql.cs
@@ -10,21 +10,20 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Memory;
 using Npgsql;
+using NpgsqlTypes;
 
 namespace PlatformBenchmarks;
 
 public sealed class RawDb
 {
-    private readonly ConcurrentRandom _random;
     private readonly MemoryCache _cache
         = new(new MemoryCacheOptions { ExpirationScanFrequency = TimeSpan.FromMinutes(60) });
 
     private readonly NpgsqlDataSource _dataSource;
 
-    public RawDb(ConcurrentRandom random, AppSettings appSettings)
+    public RawDb(AppSettings appSettings)
     {
-        _random = random;
-        _dataSource = NpgsqlDataSource.Create(appSettings.ConnectionString);
+        _dataSource = new NpgsqlSlimDataSourceBuilder(appSettings.ConnectionString).EnableArrays().Build();
     }
 
     public async Task<World> LoadSingleQueryRow()
@@ -42,10 +41,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))
             {
@@ -76,7 +75,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.TypedValue = id;
                 key = cacheKeys[id];
             }
@@ -109,30 +108,18 @@ public async Task<World[]> LoadMultipleQueriesRows(int count)
 
         using var connection = await _dataSource.OpenConnectionAsync();
 
-        using var batch = new NpgsqlBatch(connection)
-        {
-            // Inserts a PG Sync message between each statement in the batch, required for compliance with
-            // TechEmpower general test requirement 7
-            // https://github.com/TechEmpower/FrameworkBenchmarks/wiki/Project-Information-Framework-Tests-Overview
-            EnableErrorBarriers = true
-        };
-
-        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) = CreateReadCommand(connection);
+        using (queryCmd)
         {
-            batch.BatchCommands.Add(new()
+            for (var i = 0; i < results.Length; i++)
             {
-                CommandText = "SELECT id, randomnumber FROM world WHERE id = $1",
-                Parameters = { new NpgsqlParameter<int> { TypedValue = _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.TypedValue = Random.Shared.Next(1, 10001);
+                results[i] = await ReadSingleRow(queryCmd);
+            }
         }
 
         return results;
@@ -142,33 +129,44 @@ 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 = CreateConnection();
         await connection.OpenAsync();
 
+        // 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) = CreateReadCommand(connection);
         using (queryCmd)
         {
             for (var i = 0; i < results.Length; i++)
             {
+                queryParameter.TypedValue = ids[i];
                 results[i] = await ReadSingleRow(queryCmd);
-                queryParameter.TypedValue = _random.Next(1, 10001);
             }
         }
 
-        using (var updateCmd = new NpgsqlCommand(BatchUpdateString.Query(count), connection))
+        var numbers = new int[count];
+        for (var i = 0; i < count; i++)
         {
-            for (var i = 0; i < results.Length; i++)
-            {
-                var randomNumber = _random.Next(1, 10001);
+            var randomNumber = Random.Shared.Next(1, 10001);
+            results[i].RandomNumber = randomNumber;
+            numbers[i] = randomNumber;
+        }
 
-                updateCmd.Parameters.Add(new NpgsqlParameter<int> { TypedValue = results[i].Id });
-                updateCmd.Parameters.Add(new NpgsqlParameter<int> { TypedValue = randomNumber });
+        var update = "UPDATE world w SET randomnumber = u.new_val FROM (SELECT unnest($1) as id, unnest($2) as new_val) u WHERE w.id = u.id";
 
-                results[i].RandomNumber = randomNumber;
-            }
+        using var updateCmd = new NpgsqlCommand(update, connection);
+        updateCmd.Parameters.Add(new NpgsqlParameter<int[]> { TypedValue = ids, NpgsqlDbType = NpgsqlDbType.Array | NpgsqlDbType.Integer });
+        updateCmd.Parameters.Add(new NpgsqlParameter<int[]> { TypedValue = numbers, NpgsqlDbType = NpgsqlDbType.Array | NpgsqlDbType.Integer });
 
-            await updateCmd.ExecuteNonQueryAsync();
-        }
+        await updateCmd.ExecuteNonQueryAsync();
 
         return results;
     }
@@ -203,7 +201,7 @@ public async Task<List<FortuneUtf8>> LoadFortunesRows()
     private (NpgsqlCommand readCmd, NpgsqlParameter<int> idParameter) CreateReadCommand(NpgsqlConnection connection)
     {
         var cmd = new NpgsqlCommand("SELECT id, randomnumber FROM world WHERE id = $1", connection);
-        var parameter = new NpgsqlParameter<int> { TypedValue = _random.Next(1, 10001) };
+        var parameter = new NpgsqlParameter<int> { TypedValue = Random.Shared.Next(1, 10001) };
 
         cmd.Parameters.Add(parameter);
 
diff --git a/frameworks/CSharp/aspnetcore/src/Platform/Platform.csproj b/frameworks/CSharp/aspnetcore/src/Platform/Platform.csproj
@@ -18,10 +18,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql" Version="9.0.2" />
-    <PackageReference Include="MySqlConnector" Version="2.3.7" />
-    <PackageReference Include="Dapper" Version="2.1.35" />
-    <PackageReference Include="RazorSlices" Version="0.8.1" />
+    <PackageReference Include="Npgsql" Version="10.0.0" />
+    <PackageReference Include="MySqlConnector" Version="2.5.0" />
+    <PackageReference Include="Dapper" Version="2.1.66" />
+    <PackageReference Include="RazorSlices" Version="0.9.5" />
   </ItemGroup>
 
   <ItemGroup Condition="$(PublishAot) == 'true'">
diff --git a/frameworks/CSharp/aspnetcore/src/Platform/Program.cs b/frameworks/CSharp/aspnetcore/src/Platform/Program.cs
