hot fix 2

Author: LiamHamsters

src/Ydb.Sdk/src/Ado/YdbConnection.cs

@@ -82,7 +82,7 @@ internal async Task BulkUpsertInternalAsync<T>(
             throw new InvalidOperationException("Underlying session does not support BulkUpsertAsync");
         }
     }
-    
+
     public YdbBulkUpsertImporter<T> BeginBulkUpsert<T>(
         string tablePath,
         BulkUpsertOptions? options = null,

src/Ydb.Sdk/src/Ado/YdbDataSource.cs

@@ -67,7 +67,7 @@ protected override async ValueTask DisposeAsyncCore() =>
         await PoolManager.ClearPool(_ydbConnectionStringBuilder.ConnectionString);
 
     protected override void Dispose(bool disposing) => DisposeAsyncCore().AsTask().GetAwaiter().GetResult();
-    
+
     public async Task<YdbBulkUpsertImporter<T>> BeginBulkUpsertAsync<T>(
         string tablePath,
         BulkUpsertOptions? options = null,

src/Ydb.Sdk/src/Services/Query/SessionPool.cs

@@ -228,7 +228,7 @@ internal override async Task DeleteSession()
             throw YdbException.FromServer(deleteSessionResponse.Status, deleteSessionResponse.Issues);
         }
     }
-    
+
     internal async Task<BulkUpsertResponse> BulkUpsertAsync(BulkUpsertRequest req, CancellationToken ct = default)
     {
         var settings = MakeGrpcRequestSettings(new GrpcRequestSettings { CancellationToken = ct });

src/Ydb.Sdk/src/Services/Table/BulkUpsertExtensions.cs

@@ -1,5 +1,5 @@
-using Ydb.Sdk.Ado.BulkUpsert;
 using Ydb.Operations;
+using Ydb.Sdk.Ado.BulkUpsert;
 using Ydb.Sdk.Client;
 using Ydb.Table;
 
@@ -11,9 +11,8 @@ public static async Task<IResponse> BulkUpsertWithRetry<T>(
         this TableClient tableClient,
         string tablePath,
         IReadOnlyCollection<T> rows,
-        RetrySettings? retrySettings = null)
-    {
-        return await tableClient.SessionExec(
+        RetrySettings? retrySettings = null) =>
+        await tableClient.SessionExec(
             async session =>
             {
                 var req = new BulkUpsertRequest
@@ -27,5 +26,4 @@ public static async Task<IResponse> BulkUpsertWithRetry<T>(
             },
             retrySettings
         );
-    }
 }

src/Ydb.Sdk/src/Services/Table/Session.cs

@@ -82,7 +82,7 @@ private async Task<TResponse> UnaryCall<TRequest, TResponse>(
             settings: settings
         );
     }
-    
+
     public Task<BulkUpsertResponse> BulkUpsertAsync(BulkUpsertRequest req, CancellationToken ct = default)
         => Driver.UnaryCall(TableService.BulkUpsertMethod, req, new GrpcRequestSettings { CancellationToken = ct });
 }

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbConnectionTests.cs

@@ -308,8 +308,8 @@ private List<Task> GenerateTasks() => Enumerable.Range(0, 100).Select(async i =>
 
     protected override async Task OnDisposeAsync() =>
         await YdbConnection.ClearPool(new YdbConnection(_connectionStringTls));
-    
-    public class TestEntity
+
+    private class TestEntity
     {
         public int Id { get; set; }
         public string Name { get; set; }
@@ -325,7 +325,7 @@ public async Task BulkUpsertImporter_HappyPath_С()
         await using var conn = new YdbConnection(_connectionStringTls);
         await conn.OpenAsync();
 
-        using (var createCmd = conn.CreateCommand())
+        await using (var createCmd = conn.CreateCommand())
         {
             createCmd.CommandText = $@"
 CREATE TABLE {tableName} (
@@ -348,14 +348,14 @@ PRIMARY KEY (Id)
                 await importer.WriteRowAsync(row);
         }
 
-        using (var checkCmd = conn.CreateCommand())
+        await using (var checkCmd = conn.CreateCommand())
         {
             checkCmd.CommandText = $"SELECT COUNT(*) FROM {tableName}";
             var count = Convert.ToInt32(await checkCmd.ExecuteScalarAsync());
             Assert.Equal(rows.Count, count);
         }
 
-        using (var dropCmd = conn.CreateCommand())
+        await using (var dropCmd = conn.CreateCommand())
         {
             dropCmd.CommandText = $"DROP TABLE {tableName}";
             await dropCmd.ExecuteNonQueryAsync();
@@ -372,7 +372,7 @@ public async Task BulkUpsert_InsertsNewRows_С()
         await using var conn = new YdbConnection(_connectionStringTls);
         await conn.OpenAsync();
 
-        using (var createCmd = conn.CreateCommand())
+        await using (var createCmd = conn.CreateCommand())
         {
             createCmd.CommandText = $@"
     CREATE TABLE {tableName} (
@@ -387,8 +387,8 @@ PRIMARY KEY (Id)
 
         var firstRows = new List<TestEntity>
         {
-            new TestEntity { Id = 1, Name = "Alice" },
-            new TestEntity { Id = 2, Name = "Bob" }
+            new() { Id = 1, Name = "Alice" },
+            new() { Id = 2, Name = "Bob" }
         };
         await using (var importer = conn.BeginBulkUpsert<TestEntity>(absTablePath))
         {
@@ -398,20 +398,20 @@ PRIMARY KEY (Id)
 
         var newRows = new List<TestEntity>
         {
-            new TestEntity { Id = 3, Name = "Charlie" },
-            new TestEntity { Id = 4, Name = "Diana" }
+            new() { Id = 3, Name = "Charlie" },
+            new() { Id = 4, Name = "Diana" }
         };
         await using (var importer = conn.BeginBulkUpsert<TestEntity>(absTablePath))
         {
             foreach (var row in newRows)
                 await importer.WriteRowAsync(row);
         }
 
-        using (var selectCmd = conn.CreateCommand())
+        await using (var selectCmd = conn.CreateCommand())
         {
             selectCmd.CommandText = $"SELECT Id, Name FROM {tableName}";
             var results = new Dictionary<int, string>();
-            using var reader = await selectCmd.ExecuteReaderAsync();
+            await using var reader = await selectCmd.ExecuteReaderAsync();
             while (await reader.ReadAsync())
             {
                 results[reader.GetInt32(0)] = reader.GetString(1);
@@ -424,7 +424,7 @@ PRIMARY KEY (Id)
             Assert.Equal("Diana", results[4]);
         }
 
-        using (var dropCmd = conn.CreateCommand())
+        await using (var dropCmd = conn.CreateCommand())
         {
             dropCmd.CommandText = $"DROP TABLE {tableName};";
             await dropCmd.ExecuteNonQueryAsync();
@@ -441,7 +441,7 @@ public async Task BulkUpsert_UpdatesExistingRows_С()
         await using var conn = new YdbConnection(_connectionStringTls);
         await conn.OpenAsync();
 
-        using (var createCmd = conn.CreateCommand())
+        await using (var createCmd = conn.CreateCommand())
         {
             createCmd.CommandText = $@"
 CREATE TABLE {tableName} (
@@ -466,14 +466,14 @@ PRIMARY KEY (Id)
             await importer.WriteRowAsync(updated);
         }
 
-        using (var selectCmd = conn.CreateCommand())
+        await using (var selectCmd = conn.CreateCommand())
         {
             selectCmd.CommandText = $"SELECT Name FROM {tableName} WHERE Id = 1;";
             var name = (string)await selectCmd.ExecuteScalarAsync();
             Assert.Equal("Alice Updated", name);
         }
 
-        using (var dropCmd = conn.CreateCommand())
+        await using (var dropCmd = conn.CreateCommand())
         {
             dropCmd.CommandText = $"DROP TABLE {tableName};";
             await dropCmd.ExecuteNonQueryAsync();

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbDataSourceTests.cs

@@ -56,7 +56,7 @@ public void OpenConnection_FromDataSource_ReturnOpenConnection()
         using var ydbConnection = _dataSource.OpenConnection();
         Assert.Equal(1, new YdbCommand(ydbConnection) { CommandText = "SELECT 1" }.ExecuteScalar());
     }
-    
+
     public class TestEntity
     {
         public int Id { get; set; }
@@ -68,7 +68,7 @@ public async Task BulkUpsertImporter_HappyPath_Works_DS()
     {
         var tableName = "BulkTest_" + Guid.NewGuid().ToString("N");
         var database = new YdbConnectionStringBuilder(_dataSource.ConnectionString).Database.TrimEnd('/');
-        
+
         await using var conn = await _dataSource.OpenConnectionAsync();
 
         using (var createCmd = conn.CreateCommand())
@@ -136,8 +136,8 @@ PRIMARY KEY (Id)
 
         var firstRows = new List<TestEntity>
         {
-            new TestEntity { Id = 1, Name = "Alice" },
-            new TestEntity { Id = 2, Name = "Bob" }
+            new() { Id = 1, Name = "Alice" },
+            new() { Id = 2, Name = "Bob" }
         };
 
         await using (var importer = await _dataSource.BeginBulkUpsertAsync<TestEntity>(absTablePath))
@@ -148,8 +148,8 @@ PRIMARY KEY (Id)
 
         var newRows = new List<TestEntity>
         {
-            new TestEntity { Id = 3, Name = "Charlie" },
-            new TestEntity { Id = 4, Name = "Diana" }
+            new() { Id = 3, Name = "Charlie" },
+            new() { Id = 4, Name = "Diana" }
         };
 
         await using (var importer = await _dataSource.BeginBulkUpsertAsync<TestEntity>(absTablePath))