fix: * IterationSetup|IterationCleanup does not support async

SoftStoneDevelop · SoftStoneDevelop · commit ad4b7bfc9df9 · 2025-12-21T05:06:22.000+03:00
dotnet/BenchmarkDotNet#2111
diff --git a/Src/NpgsqlBenchmark/Benchmarks/BinaryImportMap.cs b/Src/NpgsqlBenchmark/Benchmarks/BinaryImportMap.cs
@@ -30,21 +30,17 @@ public async Task GlobalCleanup()
         }
 
         [IterationSetup]
-        public async Task IterationSetup()
+        public void IterationSetup()
         {
-            _connection = await _npgsqlDataSource.OpenConnectionAsync();
+            _connection = _npgsqlDataSource.OpenConnection();
         }
 
         [IterationCleanup]
-        public async Task IterationCleanup()
+        public void IterationCleanup()
         {
             try
             {
-                var connection = _connection;
-                if (connection != null)
-                {
-                    await connection.DisposeAsync();
-                }
+                _connection?.Dispose();
             }
             catch
             {
diff --git a/Src/NpgsqlBenchmark/Benchmarks/CompareDapper.cs b/Src/NpgsqlBenchmark/Benchmarks/CompareDapper.cs
@@ -33,21 +33,17 @@ public async Task GlobalCleanup()
         }
 
         [IterationSetup]
-        public async Task IterationSetup()
+        public void IterationSetup()
         {
-            _connection = await _npgsqlDataSource.OpenConnectionAsync();
+            _connection = _npgsqlDataSource.OpenConnection();
         }
 
         [IterationCleanup]
-        public async Task IterationCleanup()
+        public void IterationCleanup()
         {
             try
             {
-                var connection = _connection;
-                if (connection != null)
-                {
-                    await connection.DisposeAsync();
-                }
+                _connection?.Dispose();
             }
             catch
             {
@@ -113,7 +109,7 @@ WHERE p.id > @id
 new { id = 49999 },
 splitOn: "identification_id"
 )
-                    .ToList();
+                    .AsList();
             }
         }
 
@@ -144,7 +140,7 @@ public async Task DapperAOT()
         {
             for (int i = 0; i < Size; i++)
             {
-                var persons = DapperAOTGetAllPerson(_connection, 49999).ToList();
+                var persons = DapperAOTGetAllPerson(_connection, 49999).AsList();
             }
         }
     }
diff --git a/Src/NpgsqlBenchmark/Benchmarks/ComparePrepareDapper.cs b/Src/NpgsqlBenchmark/Benchmarks/ComparePrepareDapper.cs
@@ -31,21 +31,17 @@ public async Task GlobalCleanup()
         }
 
         [IterationSetup]
-        public async Task IterationSetup()
+        public void IterationSetup()
         {
-            _connection = await _npgsqlDataSource.OpenConnectionAsync();
+            _connection = _npgsqlDataSource.OpenConnection();
         }
 
         [IterationCleanup]
-        public async Task IterationCleanup()
+        public void IterationCleanup()
         {
             try
             {
-                var connection = _connection;
-                if (connection != null)
-                {
-                    await connection.DisposeAsync();
-                }
+                _connection?.Dispose();
             }
             catch
             {
@@ -120,7 +116,7 @@ WHERE p.id < @id
 param,
 splitOn: "identification_id"
 )
-                    .ToList();
+                    .AsList();
             }
         }
     }
diff --git a/Src/NpgsqlBenchmark/Benchmarks/QueryMap.cs b/Src/NpgsqlBenchmark/Benchmarks/QueryMap.cs
@@ -31,21 +31,17 @@ public async Task GlobalCleanup()
         }
 
         [IterationSetup]
-        public async Task IterationSetup()
+        public void IterationSetup()
         {
-            _connection = await _npgsqlDataSource.OpenConnectionAsync();
+            _connection = _npgsqlDataSource.OpenConnection();
         }
 
         [IterationCleanup]
-        public async Task IterationCleanup()
+        public void IterationCleanup()
         {
             try
             {
-                var connection = _connection;
-                if (connection != null)
-                {
-                    await connection.DisposeAsync();
-                }
+                _connection?.Dispose();
             }
             catch
             {

Original file line number	Diff line number	Diff line change
`@@ -30,21 +30,17 @@ public async Task GlobalCleanup()`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[IterationSetup]`
`33`		`- public async Task IterationSetup()`
	`33`	`+ public void IterationSetup()`
`34`	`34`	`{`
`35`		`- _connection = await _npgsqlDataSource.OpenConnectionAsync();`
	`35`	`+ _connection = _npgsqlDataSource.OpenConnection();`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`[IterationCleanup]`
`39`		`- public async Task IterationCleanup()`
	`39`	`+ public void IterationCleanup()`
`40`	`40`	`{`
`41`	`41`	`try`
`42`	`42`	`{`
`43`		`- var connection = _connection;`
`44`		`- if (connection != null)`
`45`		`- {`
`46`		`- await connection.DisposeAsync();`
`47`		`- }`
	`43`	`+ _connection?.Dispose();`
`48`	`44`	`}`
`49`	`45`	`catch`
`50`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,21 +33,17 @@ public async Task GlobalCleanup()`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[IterationSetup]`
`36`		`- public async Task IterationSetup()`
	`36`	`+ public void IterationSetup()`
`37`	`37`	`{`
`38`		`- _connection = await _npgsqlDataSource.OpenConnectionAsync();`
	`38`	`+ _connection = _npgsqlDataSource.OpenConnection();`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`[IterationCleanup]`
`42`		`- public async Task IterationCleanup()`
	`42`	`+ public void IterationCleanup()`
`43`	`43`	`{`
`44`	`44`	`try`
`45`	`45`	`{`
`46`		`- var connection = _connection;`
`47`		`- if (connection != null)`
`48`		`- {`
`49`		`- await connection.DisposeAsync();`
`50`		`- }`
	`46`	`+ _connection?.Dispose();`
`51`	`47`	`}`
`52`	`48`	`catch`
`53`	`49`	`{`
`@@ -113,7 +109,7 @@ WHERE p.id > @id`
`113`	`109`	`new { id = 49999 },`
`114`	`110`	`splitOn: "identification_id"`
`115`	`111`	`)`
`116`		`- .ToList();`
	`112`	`+ .AsList();`
`117`	`113`	`}`
`118`	`114`	`}`
`119`	`115`
`@@ -144,7 +140,7 @@ public async Task DapperAOT()`
`144`	`140`	`{`
`145`	`141`	`for (int i = 0; i < Size; i++)`
`146`	`142`	`{`
`147`		`- var persons = DapperAOTGetAllPerson(_connection, 49999).ToList();`
	`143`	`+ var persons = DapperAOTGetAllPerson(_connection, 49999).AsList();`
`148`	`144`	`}`
`149`	`145`	`}`
`150`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,21 +31,17 @@ public async Task GlobalCleanup()`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`[IterationSetup]`
`34`		`- public async Task IterationSetup()`
	`34`	`+ public void IterationSetup()`
`35`	`35`	`{`
`36`		`- _connection = await _npgsqlDataSource.OpenConnectionAsync();`
	`36`	`+ _connection = _npgsqlDataSource.OpenConnection();`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`[IterationCleanup]`
`40`		`- public async Task IterationCleanup()`
	`40`	`+ public void IterationCleanup()`
`41`	`41`	`{`
`42`	`42`	`try`
`43`	`43`	`{`
`44`		`- var connection = _connection;`
`45`		`- if (connection != null)`
`46`		`- {`
`47`		`- await connection.DisposeAsync();`
`48`		`- }`
	`44`	`+ _connection?.Dispose();`
`49`	`45`	`}`
`50`	`46`	`catch`
`51`	`47`	`{`
`@@ -120,7 +116,7 @@ WHERE p.id < @id`
`120`	`116`	`param,`
`121`	`117`	`splitOn: "identification_id"`
`122`	`118`	`)`
`123`		`- .ToList();`
	`119`	`+ .AsList();`
`124`	`120`	`}`
`125`	`121`	`}`
`126`	`122`	`}`