Merge branch 'main' into add-implicit-session-flag

LiamHamsters · LiamHamsters · commit 0df1155c02a3 · 2025-09-02T17:55:30.000+03:00
diff --git a/src/Ydb.Sdk/src/Ado/PoolManager.cs b/src/Ydb.Sdk/src/Ado/PoolManager.cs
@@ -6,7 +6,9 @@ namespace Ydb.Sdk.Ado;
 internal static class PoolManager
 {
     private static readonly SemaphoreSlim SemaphoreSlim = new(1); // async mutex
-    private static readonly ConcurrentDictionary<string, ISessionSource> Pools = new();
+
+    internal static readonly ConcurrentDictionary<string, IDriver> Drivers = new();
+    internal static readonly ConcurrentDictionary<string, ISessionSource> Pools = new();
 
     internal static async Task<ISession> GetSession(
         YdbConnectionStringBuilder settings,
@@ -27,9 +29,14 @@ CancellationToken cancellationToken
                 return await pool.OpenSession(cancellationToken);
             }
 
-            var newSessionPool = new PoolingSessionSource<PoolingSession>(
-                await PoolingSessionFactory.Create(settings), settings
-            );
+            var driver = Drivers.TryGetValue(settings.GrpcConnectionString, out var cacheDriver) &&
+                         !cacheDriver.IsDisposed
+                ? cacheDriver
+                : Drivers[settings.GrpcConnectionString] = await settings.BuildDriver();
+            driver.RegisterOwner();
+
+            var factory = new PoolingSessionFactory(driver, settings);
+            var newSessionPool = new PoolingSessionSource<PoolingSession>(factory, settings);
 
             Pools[settings.ConnectionString] = newSessionPool;
 
diff --git a/src/Ydb.Sdk/src/Ado/YdbCommand.cs b/src/Ydb.Sdk/src/Ado/YdbCommand.cs
@@ -216,31 +216,9 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
             throw new InvalidOperationException("Transaction mismatched! (Maybe using another connection)");
         }
 
-        var useImplicit = YdbConnection.EnableImplicitSession && transaction is null;
-        var session = YdbConnection.GetExecutionSession(useImplicit);
-
-        YdbDataReader ydbDataReader;
-        try
-        {
-            var execResult = await session.ExecuteQuery(
-                preparedSql.ToString(),
-                ydbParameters,
-                execSettings,
-                transaction?.TransactionControl
-            );
-
-            ydbDataReader = await YdbDataReader.CreateYdbDataReader(
-                execResult,
-                YdbConnection.OnNotSuccessStatusCode,
-                transaction,
-                cancellationToken
-            );
-        }
-        finally
-        {
-            if (useImplicit)
-                session.Close();
-        }
+        var ydbDataReader = await YdbDataReader.CreateYdbDataReader(await YdbConnection.Session.ExecuteQuery(
+            preparedSql.ToString(), ydbParameters, execSettings, transaction?.TransactionControl
+        ), YdbConnection.OnNotSuccessStatusCode, transaction, cancellationToken);
 
         YdbConnection.LastReader = ydbDataReader;
         YdbConnection.LastCommand = CommandText;
diff --git a/src/Ydb.Sdk/src/Ado/YdbConnection.cs b/src/Ydb.Sdk/src/Ado/YdbConnection.cs
@@ -38,16 +38,6 @@ internal ISession Session
     }
 
     private ISession _session = null!;
-    
-    internal bool EnableImplicitSession => ConnectionStringBuilder.EnableImplicitSession;
-    
-    internal ISession GetExecutionSession(bool useImplicit)
-        => useImplicit ? new ImplicitSession(Session.Driver) : Session;
-
-    internal bool EnableImplicitSession => ConnectionStringBuilder.EnableImplicitSession;
-
-    internal ISession GetExecutionSession(bool useImplicit)
-        => useImplicit ? PoolManager.GetImplicitSession(ConnectionStringBuilder) : Session;
 
     public YdbConnection()
     {
diff --git a/src/Ydb.Sdk/src/Ado/YdbConnectionStringBuilder.cs b/src/Ydb.Sdk/src/Ado/YdbConnectionStringBuilder.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Ydb.Sdk.Auth;
-using Ydb.Sdk.Pool;
 using Ydb.Sdk.Transport;
 
 namespace Ydb.Sdk.Ado;
@@ -29,8 +28,8 @@ private void InitDefaultValues()
         _port = 2136;
         _database = "/local";
         _minSessionPool = 0;
-        _maxSessionPool = SessionPoolDefaultSettings.MaxSessionPool;
-        _createSessionTimeout = SessionPoolDefaultSettings.CreateSessionTimeoutSeconds;
+        _maxSessionPool = 100;
+        _createSessionTimeout = 5;
         _sessionIdleTimeout = 300;
         _useTls = false;
         _connectTimeout = GrpcDefaultSettings.ConnectTimeoutSeconds;
@@ -41,7 +40,6 @@ private void InitDefaultValues()
         _maxReceiveMessageSize = GrpcDefaultSettings.MaxReceiveMessageSize;
         _disableDiscovery = GrpcDefaultSettings.DisableDiscovery;
         _disableServerBalancer = false;
-        _enableImplicitSession = false;
     }
 
     public string Host
@@ -316,19 +314,7 @@ public int CreateSessionTimeout
 
     private int _createSessionTimeout;
 
-    public bool EnableImplicitSession
-    {
-        get => _enableImplicitSession;
-        set
-        {
-            _enableImplicitSession = value;
-            SaveValue(nameof(EnableImplicitSession), value);
-        }
-    }
-
-    private bool _enableImplicitSession;
-
-    public ILoggerFactory? LoggerFactory { get; init; }
+    public ILoggerFactory LoggerFactory { get; init; } = NullLoggerFactory.Instance;
 
     public ICredentialsProvider? CredentialsProvider { get; init; }
 
@@ -372,6 +358,12 @@ public override object this[string keyword]
 
     private string Endpoint => $"{(UseTls ? "grpcs" : "grpc")}://{Host}:{Port}";
 
+    internal string GrpcConnectionString =>
+        $"UseTls={UseTls};Host={Host};Port={Port};Database={Database};User={User};Password={Password};" +
+        $"ConnectTimeout={ConnectTimeout};KeepAlivePingDelay={KeepAlivePingDelay};KeepAlivePingTimeout={KeepAlivePingTimeout};" +
+        $"EnableMultipleHttp2Connections={EnableMultipleHttp2Connections};MaxSendMessageSize={MaxSendMessageSize};" +
+        $"MaxReceiveMessageSize={MaxReceiveMessageSize};DisableDiscovery={DisableDiscovery}";
+
     internal async Task<IDriver> BuildDriver()
     {
         var cert = RootCertificate != null ? X509Certificate.CreateFromCertFile(RootCertificate) : null;
@@ -398,11 +390,10 @@ internal async Task<IDriver> BuildDriver()
             MaxSendMessageSize = MaxSendMessageSize,
             MaxReceiveMessageSize = MaxReceiveMessageSize
         };
-        var loggerFactory = LoggerFactory ?? NullLoggerFactory.Instance;
 
         return DisableDiscovery
-            ? new DirectGrpcChannelDriver(driverConfig, loggerFactory)
-            : await Driver.CreateInitialized(driverConfig, loggerFactory);
+            ? new DirectGrpcChannelDriver(driverConfig, LoggerFactory)
+            : await Driver.CreateInitialized(driverConfig, LoggerFactory);
     }
 
     public override void Clear()
@@ -504,9 +495,6 @@ static YdbConnectionOption()
             AddOption(new YdbConnectionOption<bool>(BoolExtractor,
                     (builder, disableServerBalancer) => builder.DisableServerBalancer = disableServerBalancer),
                 "DisableServerBalancer", "Disable Server Balancer");
-            AddOption(new YdbConnectionOption<bool>(BoolExtractor,
-                    (builder, enableImplicit) => builder.EnableImplicitSession = enableImplicit),
-                "EnableImplicitSession", "ImplicitSession");
         }
 
         private static void AddOption(YdbConnectionOption option, params string[] keys)
diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbConnectionStringBuilderTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbConnectionStringBuilderTests.cs
@@ -4,6 +4,8 @@ namespace Ydb.Sdk.Ado.Tests;
 
 public class YdbConnectionStringBuilderTests
 {
+    private const int MessageSize = 64 * 1024 * 1024;
+
     [Fact]
     public void InitDefaultValues_WhenEmptyConstructorInvoke_ReturnDefaultConnectionString()
     {
@@ -23,12 +25,16 @@ public void InitDefaultValues_WhenEmptyConstructorInvoke_ReturnDefaultConnection
         Assert.Equal(10, ydbConnectionStringBuilder.KeepAlivePingTimeout);
         Assert.Equal("", ydbConnectionStringBuilder.ConnectionString);
         Assert.False(ydbConnectionStringBuilder.EnableMultipleHttp2Connections);
-        Assert.Equal(64 * 1024 * 1024, ydbConnectionStringBuilder.MaxSendMessageSize);
-        Assert.Equal(64 * 1024 * 1024, ydbConnectionStringBuilder.MaxReceiveMessageSize);
+        Assert.Equal(MessageSize, ydbConnectionStringBuilder.MaxSendMessageSize);
+        Assert.Equal(MessageSize, ydbConnectionStringBuilder.MaxReceiveMessageSize);
         Assert.False(ydbConnectionStringBuilder.DisableDiscovery);
         Assert.False(ydbConnectionStringBuilder.DisableServerBalancer);
         Assert.False(ydbConnectionStringBuilder.UseTls);
-        Assert.False(ydbConnectionStringBuilder.EnableImplicitSession);
+
+        Assert.Equal("UseTls=False;Host=localhost;Port=2136;Database=/local;User=;Password=;ConnectTimeout=5;" +
+                     "KeepAlivePingDelay=10;KeepAlivePingTimeout=10;EnableMultipleHttp2Connections=False;" +
+                     $"MaxSendMessageSize={MessageSize};MaxReceiveMessageSize={MessageSize};DisableDiscovery=False",
+            ydbConnectionStringBuilder.GrpcConnectionString);
     }
 
     [Fact]
@@ -44,69 +50,81 @@ public void InitConnectionStringBuilder_WhenUnexpectedKey_ThrowException()
     [Fact]
     public void InitConnectionStringBuilder_WhenExpectedKeys_ReturnUpdatedConnectionString()
     {
-        var connectionString = new YdbConnectionStringBuilder(
-            "Host=server;Port=2135;Database=/my/path;User=Kirill;UseTls=true;" +
-            "MinSessionPool=10;MaxSessionPool=50;CreateSessionTimeout=30;" +
-            "SessionIdleTimeout=600;" +
-            "ConnectTimeout=30;KeepAlivePingDelay=30;KeepAlivePingTimeout=60;" +
-            "EnableMultipleHttp2Connections=true;" +
-            "MaxSendMessageSize=1000000;MaxReceiveMessageSize=1000000;" +
-            "DisableDiscovery=true;DisableServerBalancer=true;EnableImplicitSession=true;"
+        var ydbConnectionStringBuilder = new YdbConnectionStringBuilder(
+            "Host=server;Port=2135;Database=/my/path;User=Kirill;UseTls=true;MinSessionPool=10;MaxSessionPool=50;" +
+            "CreateSessionTimeout=30;SessionIdleTimeout=600;ConnectTimeout=30;KeepAlivePingDelay=30;" +
+            "KeepAlivePingTimeout=60;EnableMultipleHttp2Connections=true;MaxSendMessageSize=1000000;" +
+            "MaxReceiveMessageSize=1000000;DisableDiscovery=true;DisableServerBalancer=true;"
         );
 
-        Assert.Equal(2135, connectionString.Port);
-        Assert.Equal("server", connectionString.Host);
-        Assert.Equal("/my/path", connectionString.Database);
-        Assert.Equal(10, connectionString.MinSessionPool);
-        Assert.Equal(50, connectionString.MaxSessionPool);
-        Assert.Equal(30, connectionString.CreateSessionTimeout);
-        Assert.Equal(600, connectionString.SessionIdleTimeout);
-        Assert.Equal("Kirill", connectionString.User);
-        Assert.Equal(30, connectionString.ConnectTimeout);
-        Assert.Equal(30, connectionString.KeepAlivePingDelay);
-        Assert.Equal(60, connectionString.KeepAlivePingTimeout);
-        Assert.Null(connectionString.Password);
-        Assert.True(connectionString.EnableMultipleHttp2Connections);
-        Assert.Equal(1000000, connectionString.MaxSendMessageSize);
-        Assert.Equal(1000000, connectionString.MaxReceiveMessageSize);
+        Assert.Equal(2135, ydbConnectionStringBuilder.Port);
+        Assert.Equal("server", ydbConnectionStringBuilder.Host);
+        Assert.Equal("/my/path", ydbConnectionStringBuilder.Database);
+        Assert.Equal(10, ydbConnectionStringBuilder.MinSessionPool);
+        Assert.Equal(50, ydbConnectionStringBuilder.MaxSessionPool);
+        Assert.Equal(30, ydbConnectionStringBuilder.CreateSessionTimeout);
+        Assert.Equal(600, ydbConnectionStringBuilder.SessionIdleTimeout);
+        Assert.Equal("Kirill", ydbConnectionStringBuilder.User);
+        Assert.Equal(30, ydbConnectionStringBuilder.ConnectTimeout);
+        Assert.Equal(30, ydbConnectionStringBuilder.KeepAlivePingDelay);
+        Assert.Equal(60, ydbConnectionStringBuilder.KeepAlivePingTimeout);
+        Assert.Null(ydbConnectionStringBuilder.Password);
+        Assert.True(ydbConnectionStringBuilder.EnableMultipleHttp2Connections);
+        Assert.Equal(1000000, ydbConnectionStringBuilder.MaxSendMessageSize);
+        Assert.Equal(1000000, ydbConnectionStringBuilder.MaxReceiveMessageSize);
         Assert.Equal("Host=server;Port=2135;Database=/my/path;User=Kirill;UseTls=True;" +
                      "MinSessionPool=10;MaxSessionPool=50;CreateSessionTimeout=30;" +
                      "SessionIdleTimeout=600;" +
                      "ConnectTimeout=30;KeepAlivePingDelay=30;KeepAlivePingTimeout=60;" +
                      "EnableMultipleHttp2Connections=True;" +
                      "MaxSendMessageSize=1000000;MaxReceiveMessageSize=1000000;" +
-                     "DisableDiscovery=True;DisableServerBalancer=True;EnableImplicitSession=True", connectionString.ConnectionString);
-        Assert.True(connectionString.DisableDiscovery);
-        Assert.True(connectionString.DisableServerBalancer);
-        Assert.True(connectionString.EnableImplicitSession);
+                     "DisableDiscovery=True;DisableServerBalancer=True", ydbConnectionStringBuilder.ConnectionString);
+        Assert.True(ydbConnectionStringBuilder.DisableDiscovery);
+        Assert.True(ydbConnectionStringBuilder.DisableServerBalancer);
+        Assert.Equal("UseTls=True;Host=server;Port=2135;Database=/my/path;User=Kirill;Password=;ConnectTimeout=30;" +
+                     "KeepAlivePingDelay=30;KeepAlivePingTimeout=60;EnableMultipleHttp2Connections=True;" +
+                     "MaxSendMessageSize=1000000;MaxReceiveMessageSize=1000000;DisableDiscovery=True",
+            ydbConnectionStringBuilder.GrpcConnectionString);
     }
 
     [Fact]
     public void Host_WhenSetInProperty_ReturnUpdatedConnectionString()
     {
-        var connectionString = new YdbConnectionStringBuilder("Host=server;Port=2135;Database=/my/path;User=Kirill");
-
-        Assert.Equal("server", connectionString.Host);
-        connectionString.Host = "new_server";
-        Assert.Equal("new_server", connectionString.Host);
-
-        Assert.Equal("Host=new_server;Port=2135;Database=/my/path;User=Kirill", connectionString.ConnectionString);
+        var ydbConnectionStringBuilder =
+            new YdbConnectionStringBuilder("Host=server;Port=2135;Database=/my/path;User=Kirill");
+        Assert.Equal(
+            "UseTls=False;Host=server;Port=2135;Database=/my/path;User=Kirill;Password=;ConnectTimeout=5;" +
+            "KeepAlivePingDelay=10;KeepAlivePingTimeout=10;EnableMultipleHttp2Connections=False;" +
+            $"MaxSendMessageSize={MessageSize};MaxReceiveMessageSize={MessageSize};DisableDiscovery=False",
+            ydbConnectionStringBuilder.GrpcConnectionString);
+        Assert.Equal("server", ydbConnectionStringBuilder.Host);
+        ydbConnectionStringBuilder.Host = "new_server";
+        Assert.Equal("new_server", ydbConnectionStringBuilder.Host);
+        Assert.Equal(
+            "UseTls=False;Host=new_server;Port=2135;Database=/my/path;User=Kirill;Password=;ConnectTimeout=5;" +
+            "KeepAlivePingDelay=10;KeepAlivePingTimeout=10;EnableMultipleHttp2Connections=False;" +
+            $"MaxSendMessageSize={MessageSize};MaxReceiveMessageSize={MessageSize};DisableDiscovery=False",
+            ydbConnectionStringBuilder.GrpcConnectionString);
+        Assert.Equal("Host=new_server;Port=2135;Database=/my/path;User=Kirill",
+            ydbConnectionStringBuilder.ConnectionString);
     }
 
     [Fact]
     public void SetProperty_WhenPropertyNeedsTrimOperation_ReturnUpdatedConnectionString()
     {
-        var connectionString =
+        var ydbConnectionStringBuilder =
             new YdbConnectionStringBuilder(" Host  =server;Port=2135;   EnableMultipleHttp2Connections  =true");
 
-        Assert.Equal(2135, connectionString.Port);
-        Assert.Equal("server", connectionString.Host);
-        Assert.True(connectionString.EnableMultipleHttp2Connections);
+        Assert.Equal(2135, ydbConnectionStringBuilder.Port);
+        Assert.Equal("server", ydbConnectionStringBuilder.Host);
+        Assert.True(ydbConnectionStringBuilder.EnableMultipleHttp2Connections);
 
-        Assert.Equal("Host=server;Port=2135;EnableMultipleHttp2Connections=True", connectionString.ConnectionString);
+        Assert.Equal("Host=server;Port=2135;EnableMultipleHttp2Connections=True",
+            ydbConnectionStringBuilder.ConnectionString);
 
-        connectionString.EnableMultipleHttp2Connections = false;
+        ydbConnectionStringBuilder.EnableMultipleHttp2Connections = false;
 
-        Assert.Equal("Host=server;Port=2135;EnableMultipleHttp2Connections=False", connectionString.ConnectionString);
+        Assert.Equal("Host=server;Port=2135;EnableMultipleHttp2Connections=False",
+            ydbConnectionStringBuilder.ConnectionString);
     }
 }
