updating

Author: KirillKurdyukov

src/Ydb.Sdk/CHANGELOG.md

@@ -1,3 +1,6 @@
+- Optimization: On BadSession, do not invoke the `DeleteSession()` method.
+- Canceling AttachStream after calling the `DeleteSession` method.
+- Fixed bug: fixed issue where session was not deleted (`ClientTransportTimeout`).
 - Fixed bug: Grpc.Core.StatusCode.Cancelled was mapped to server's Canceled status.
 - ADO.NET: PoolingSessionSource 2.0 based on Npgsql pooling algorithm.
 - Added new ADO.NET options:

src/Ydb.Sdk/src/Ado/Internal/SqlParser.cs

@@ -232,7 +232,7 @@ StringBuilder yql
                         return startToken; // rollback parse IN LIST
                     }
 
-                    yql.Append(listStartToken > startToken ? sql[startToken..listStartToken] : ' ');
+                    yql.Append(listStartToken > startToken ? sql[startToken .. listStartToken] : ' ');
                     var paramListName = sqlParamsBuilder.AddListPrimitiveParams(findNameParams);
                     yql.Append(paramListName);
 
@@ -273,7 +273,7 @@ private static (string Name, int NextToken) ParseNameParam(string sql, int curTo
             throw new YdbException($"Have empty name parameter, invalid SQL [position: {prevToken}]");
         }
 
-        return ($"${sql[prevToken..curToken]}", curToken);
+        return ($"${sql[prevToken .. curToken]}", curToken);
     }
 
     private static bool IsSqlIdentifierChar(this char c) => char.IsLetterOrDigit(c) || c == '_';

src/Ydb.Sdk/src/Ado/Session/PoolingSession.cs

@@ -1,8 +1,3 @@
-// This file contains session pooling algorithms adapted from Npgsql
-// Original source: https://github.com/npgsql/npgsql
-// Copyright (c) 2002-2025, Npgsql
-// Licence https://github.com/npgsql/npgsql?tab=PostgreSQL-1-ov-file
-
 using Microsoft.Extensions.Logging;
 using Ydb.Query;
 using Ydb.Query.V1;
@@ -25,6 +20,7 @@ internal class PoolingSession : IPoolingSession
     private readonly CancellationTokenSource _attachStreamLifecycleCts = new();
 
     private volatile bool _isBroken = true;
+    private volatile bool _isBadSession = false;
 
     private readonly bool _disableServerBalancer;
 
@@ -105,6 +101,8 @@ public async Task RollbackTransaction(
 
     public void OnNotSuccessStatusCode(StatusCode statusCode)
     {
+        _isBadSession = _isBadSession || statusCode is StatusCode.BadSession;
+
         if (statusCode is
             StatusCode.BadSession or
             StatusCode.SessionBusy or
@@ -226,6 +224,12 @@ public async Task DeleteSession()
             _isBroken = true;
             _attachStreamLifecycleCts.CancelAfter(DeleteSessionTimeout);
 
+            if (_isBadSession)
+            {
+                return;
+            }
+
+            _isBadSession = true;
             var deleteSessionResponse = await Driver.UnaryCall(
                 QueryService.DeleteSessionMethod,
                 new DeleteSessionRequest { SessionId = SessionId },

src/Ydb.Sdk/src/Ado/Session/PoolingSessionSource.cs

@@ -1,8 +1,3 @@
-// This file contains session pooling algorithms adapted from Npgsql
-// Original source: https://github.com/npgsql/npgsql
-// Copyright (c) 2002-2025, Npgsql
-// Licence https://github.com/npgsql/npgsql?tab=PostgreSQL-1-ov-file
-
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Threading.Channels;

src/Ydb.Sdk/src/Ado/YdbCommand.cs

@@ -3,7 +3,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Ydb.Sdk.Ado.Internal;
-using Ydb.Sdk.Services.Query;
 using Ydb.Sdk.Value;
 
 namespace Ydb.Sdk.Ado;

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

@@ -61,7 +61,8 @@ public Task<T> Stream<T>(string query, Func<ExecuteQueryStream, Task<T>> onStrea
         Dictionary<string, YdbValue>? parameters = null, TxMode txMode = TxMode.NoTx,
         ExecuteQuerySettings? settings = null) =>
         _sessionPool.ExecOnSession(async session => await onStream(new ExecuteQueryStream(
-            await session.ExecuteQuery(query, parameters, settings, txMode.TransactionControl())))
+            await session.ExecuteQuery(query, parameters ?? new Dictionary<string, YdbValue>(),
+                settings ?? new GrpcRequestSettings(), txMode.TransactionControl())))
         );
 
     public Task Stream(string query, Func<ExecuteQueryStream, Task> onStream,

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

@@ -28,10 +28,13 @@ internal QueryTx(Session session, TxMode txMode)
     }
 
     public async ValueTask<ExecuteQueryStream> Stream(string query, Dictionary<string, YdbValue>? parameters = null,
-        bool commit = false, ExecuteQuerySettings? settings = null) =>
-        new(
-            await _session.ExecuteQuery(query, parameters, settings, TxControl(commit)), txId => TxId = txId
-        );
+        bool commit = false, ExecuteQuerySettings? settings = null) => new(await _session.ExecuteQuery(
+            query,
+            parameters ?? new Dictionary<string, YdbValue>(),
+            settings ?? new GrpcRequestSettings(),
+            TxControl(commit)
+        ), txId => TxId = txId
+    );
 
     public async Task<IReadOnlyList<Value.ResultSet.Row>> ReadAllRows(string query,
         Dictionary<string, YdbValue>? parameters = null, bool commit = false, ExecuteQuerySettings? settings = null)

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

@@ -18,15 +18,14 @@ internal sealed class SessionPool : SessionPool<Session>, IAsyncDisposable
 {
     private static readonly CreateSessionRequest CreateSessionRequest = new();
 
+    private readonly IDriver _driver;
     private readonly bool _disposingDriver;
     private readonly ILogger<Session> _loggerSession;
 
-    internal readonly IDriver Driver;
-
     internal SessionPool(IDriver driver, SessionPoolConfig sessionPoolConfig)
         : base(driver.LoggerFactory.CreateLogger<SessionPool>(), sessionPoolConfig)
     {
-        Driver = driver;
+        _driver = driver;
         _disposingDriver = sessionPoolConfig.DisposeDriver;
         _loggerSession = driver.LoggerFactory.CreateLogger<Session>();
     }
@@ -45,7 +44,7 @@ protected override async Task<Session> CreateSession(
             requestSettings.ClientCapabilities.Add("session-balancer");
         }
 
-        var response = await Driver.UnaryCall(
+        var response = await _driver.UnaryCall(
             QueryService.CreateSessionMethod,
             CreateSessionRequest,
             requestSettings
@@ -58,13 +57,13 @@ protected override async Task<Session> CreateSession(
         var sessionId = response.SessionId;
         var nodeId = response.NodeId;
 
-        var session = new Session(Driver, this, sessionId, nodeId, _loggerSession);
+        var session = new Session(_driver, this, sessionId, nodeId, _loggerSession);
 
         _ = Task.Run(async () =>
         {
             try
             {
-                using var stream = await Driver.ServerStreamCall(
+                using var stream = await _driver.ServerStreamCall(
                     QueryService.AttachSessionMethod,
                     new AttachSessionRequest { SessionId = sessionId },
                     new GrpcRequestSettings { NodeId = nodeId }
@@ -137,7 +136,7 @@ protected override async Task<Session> CreateSession(
         return session;
     }
 
-    protected override ValueTask DisposeDriver() => _disposingDriver ? Driver.DisposeAsync() : default;
+    protected override ValueTask DisposeDriver() => _disposingDriver ? _driver.DisposeAsync() : default;
 }
 
 internal class Session : SessionBase<Session>, ISession
@@ -156,8 +155,8 @@ ILogger<Session> logger
     public IDriver Driver { get; }
 
     public ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(
-        string query, 
-        Dictionary<string, YdbValue> parameters, 
+        string query,
+        Dictionary<string, YdbValue> parameters,
         GrpcRequestSettings settings,
         TransactionControl? txControl)
     {

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/SessionSourceBenchmark.cs

@@ -93,7 +93,7 @@ internal class MockSessionFactory : IPoolingSessionFactory
 internal class PoolingMockSession(PoolingSessionSource source) : IPoolingSession
 {
     public IDriver Driver => throw new NotImplementedException();
-    
+
     public bool IsBroken => false;
 
     public void Close() => source.Return(this);

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/Session/PoolingSessionTests.cs

@@ -269,7 +269,7 @@ private TaskCompletionSource<bool> SetupAttachStream()
     {
         var tcsSecondMoveAttachStream = new TaskCompletionSource<bool>();
 
-        _mockAttachStream.SetupSequence(attachStream => attachStream.MoveNextAsync(CancellationToken.None))
+        _mockAttachStream.SetupSequence(attachStream => attachStream.MoveNextAsync(It.IsAny<CancellationToken>()))
             .ReturnsAsync(true)
             .Returns(new ValueTask<bool>(tcsSecondMoveAttachStream.Task));
         _mockAttachStream.SetupSequence(attachStream => attachStream.Current)