init commit

KirillKurdyukov · KirillKurdyukov · commit 494b47dc3251 · 2025-07-14T19:01:17.000+03:00
diff --git a/src/Ydb.Sdk/src/Ado/Pool/ChannelPool.cs b/src/Ydb.Sdk/src/Ado/Pool/ChannelPool.cs
@@ -6,7 +6,7 @@
 using Grpc.Net.Client;
 using Microsoft.Extensions.Logging;
 
-namespace Ydb.Sdk.Pool;
+namespace Ydb.Sdk.Ado.Pool;
 
 internal class ChannelPool<T> : IAsyncDisposable where T : ChannelBase, IDisposable
 {
diff --git a/src/Ydb.Sdk/src/Ado/Pool/EndpointPool.cs b/src/Ydb.Sdk/src/Ado/Pool/EndpointPool.cs
@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using Microsoft.Extensions.Logging;
 
-namespace Ydb.Sdk.Pool;
+namespace Ydb.Sdk.Ado.Pool;
 
 internal class EndpointPool
 {
diff --git a/src/Ydb.Sdk/src/Ado/Pool/SessionPool.cs b/src/Ydb.Sdk/src/Ado/Pool/SessionPool.cs
@@ -0,0 +1,6 @@
+namespace Ydb.Sdk.Ado.Pool;
+
+public class SessionPool
+{
+    
+}
diff --git a/src/Ydb.Sdk/src/Ado/PoolManager.cs b/src/Ydb.Sdk/src/Ado/PoolManager.cs
@@ -9,7 +9,7 @@ internal static class PoolManager
     private static readonly SemaphoreSlim SemaphoreSlim = new(1); // async mutex
     private static readonly ConcurrentDictionary<string, SessionPool> Pools = new();
 
-    internal static async Task<Session> GetSession(
+    internal static async Task<Services.Query.Session> GetSession(
         YdbConnectionStringBuilder connectionString,
         CancellationToken cancellationToken
     )
diff --git a/src/Ydb.Sdk/src/Ado/Session/IAdoSession.cs b/src/Ydb.Sdk/src/Ado/Session/IAdoSession.cs
@@ -0,0 +1,17 @@
+using Ydb.Query;
+using Ydb.Sdk.Services.Query;
+using Ydb.Sdk.Value;
+
+namespace Ydb.Sdk.Ado.Session;
+
+internal interface IAdoSession
+{
+    internal ValueTask<IServerStream<ExecuteQueryResponsePart>> ExecuteQuery(
+        string query,
+        Dictionary<string, YdbValue>? parameters,
+        ExecuteQuerySettings? settings,
+        TransactionControl? txControl
+    );
+    
+    
+}
diff --git a/src/Ydb.Sdk/src/Ado/YdbConnection.cs b/src/Ydb.Sdk/src/Ado/YdbConnection.cs
@@ -24,7 +24,7 @@ private YdbConnectionStringBuilder ConnectionStringBuilder
         [param: AllowNull] init => _connectionStringBuilder = value;
     }
 
-    internal Session Session
+    internal Services.Query.Session Session
     {
         get
         {
@@ -35,7 +35,7 @@ internal Session Session
         private set => _session = value;
     }
 
-    private Session _session = null!;
+    private Services.Query.Session _session = null!;
 
     public YdbConnection()
     {
diff --git a/src/Ydb.Sdk/src/Ado/YdbConnectionStringBuilder.cs b/src/Ydb.Sdk/src/Ado/YdbConnectionStringBuilder.cs
@@ -3,6 +3,7 @@
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using Ydb.Sdk.Ado.Internal;
 using Ydb.Sdk.Auth;
 using Ydb.Sdk.Pool;
 using Ydb.Sdk.Transport;
@@ -29,6 +30,8 @@ private void InitDefaultValues()
         _port = YdbAdoDefaultSettings.Port;
         _database = YdbAdoDefaultSettings.Database;
         _maxSessionPool = SessionPoolDefaultSettings.MaxSessionPool;
+        _minSessionPool = 0;
+        _sessionIdleTimeout = 300;
         _useTls = YdbAdoDefaultSettings.UseTls;
         _connectTimeout = GrpcDefaultSettings.ConnectTimeoutSeconds;
         _keepAlivePingDelay = GrpcDefaultSettings.KeepAlivePingSeconds;
@@ -123,6 +126,40 @@ public int MaxSessionPool
 
     private int _maxSessionPool;
 
+    public int MinSessionPool
+    {
+        get => _minSessionPool;
+        set
+        {
+            if (value <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(value), value, "Invalid min session pool: " + value);
+            }
+
+            _minSessionPool = value;
+            SaveValue(nameof(MinSessionPool), value);
+        }
+    }
+
+    private int _minSessionPool;
+
+    public int SessionIdleTimeout
+    {
+        get => _sessionIdleTimeout;
+        set
+        {
+            if (value < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(value), value, "Invalid session idle timeout: " + value);
+            }
+
+            _sessionIdleTimeout = value;
+            SaveValue(nameof(SessionIdleTimeout), value);
+        }
+    }
+
+    private int _sessionIdleTimeout;
+
     public bool UseTls
     {
         get => _useTls;
diff --git a/src/Ydb.Sdk/src/Driver.cs b/src/Ydb.Sdk/src/Driver.cs
@@ -5,8 +5,7 @@
 using Ydb.Discovery;
 using Ydb.Discovery.V1;
 using Ydb.Sdk.Ado;
-using Ydb.Sdk.Ado.Internal;
-using Ydb.Sdk.Pool;
+using Ydb.Sdk.Ado.Pool;
 
 namespace Ydb.Sdk;
 
diff --git a/src/Ydb.Sdk/src/IDriver.cs b/src/Ydb.Sdk/src/IDriver.cs
@@ -1,9 +1,9 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using Microsoft.Extensions.Logging;
+using Ydb.Sdk.Ado.Pool;
 using Ydb.Sdk.Ado;
 using Ydb.Sdk.Auth;
-using Ydb.Sdk.Pool;
 using Ydb.Sdk.Services.Auth;
 
 namespace Ydb.Sdk;
diff --git a/src/Ydb.Sdk/src/Properties/AssemblyInfo.cs b/src/Ydb.Sdk/src/Properties/AssemblyInfo.cs
@@ -1,5 +1,6 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("EntityFrameworkCore.Ydb")]
+[assembly: InternalsVisibleTo("Ydb.Sdk.Ado.Benchmarks")]
 [assembly: InternalsVisibleTo("Ydb.Sdk.Ado.Tests")]
 [assembly: InternalsVisibleTo("Ydb.Sdk.Topic.Tests")]
diff --git a/src/Ydb.Sdk/src/Services/Auth/StaticCredentialsAuthClient.cs b/src/Ydb.Sdk/src/Services/Auth/StaticCredentialsAuthClient.cs
@@ -3,10 +3,10 @@
 using Microsoft.Extensions.Logging;
 using Ydb.Auth;
 using Ydb.Auth.V1;
+using Ydb.Sdk.Ado.Pool;
 using Ydb.Sdk.Ado;
 using Ydb.Sdk.Ado.Internal;
 using Ydb.Sdk.Auth;
-using Ydb.Sdk.Pool;
 
 namespace Ydb.Sdk.Services.Auth;
 
diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/Program.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/Program.cs
@@ -0,0 +1,12 @@
+using System.Reflection;
+using BenchmarkDotNet.Running;
+
+Console.WriteLine("YDB .NET SDK Session Pool Benchmarks");
+Console.WriteLine("=====================================");
+
+var summaries = new BenchmarkSwitcher(typeof(Program).GetTypeInfo().Assembly).Run(args);
+
+foreach (var summary in summaries)
+{
+    Console.WriteLine($"Benchmark completed. Results saved to: {summary.ResultsDirectoryPath}");
+}
diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/README.md b/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/README.md
@@ -0,0 +1 @@
+# YDB .NET SDK Session Pool Benchmarks
diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/SessionPoolBenchmark.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/SessionPoolBenchmark.cs
@@ -0,0 +1,114 @@
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Jobs;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Ydb.Sdk.Pool;
+
+namespace Ydb.Sdk.Ado.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net80)]
+[MemoryDiagnoser]
+[ThreadingDiagnoser]
+public class SessionPoolBenchmark
+{
+    private TestSessionPool _sessionPool = null!;
+    private const int SessionPoolSize = 50;
+    private const int ConcurrentTasks = 20;
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        var config = new SessionPoolConfig(MaxSessionPool: SessionPoolSize);
+
+        _sessionPool = new TestSessionPool(NullLogger<TestSessionPool>.Instance, config);
+    }
+
+    [GlobalCleanup]
+    public async Task Cleanup() => await _sessionPool.DisposeAsync();
+
+    [Benchmark]
+    public async Task SingleThreaded_OpenClose()
+    {
+        var session = await _sessionPool.GetSession();
+        await session.Release();
+    }
+
+    [Benchmark]
+    public async Task MultiThreaded_OpenClose()
+    {
+        var tasks = new Task[ConcurrentTasks];
+
+        for (var i = 0; i < ConcurrentTasks; i++)
+        {
+            tasks[i] = Task.Run(async () =>
+            {
+                var session = await _sessionPool.GetSession();
+                await session.Release();
+            });
+        }
+
+        await Task.WhenAll(tasks);
+    }
+
+    [Benchmark]
+    public async Task HighContention_OpenClose()
+    {
+        const int highContentionTasks = 100;
+        var tasks = new Task[highContentionTasks];
+
+        for (var i = 0; i < highContentionTasks; i++)
+        {
+            tasks[i] = Task.Run(async () =>
+            {
+                var session = await _sessionPool.GetSession();
+                await session.Release();
+            });
+        }
+
+        await Task.WhenAll(tasks);
+    }
+
+    [Benchmark]
+    public async Task SessionReuse_Pattern()
+    {
+        const int iterations = 10;
+        var tasks = new Task[ConcurrentTasks];
+
+        for (var i = 0; i < ConcurrentTasks; i++)
+        {
+            tasks[i] = Task.Run(async () =>
+            {
+                for (var j = 0; j < iterations; j++)
+                {
+                    var session = await _sessionPool.GetSession();
+                    await session.Release();
+                }
+            });
+        }
+
+        await Task.WhenAll(tasks);
+    }
+}
+
+internal class TestSessionPool(ILogger<TestSessionPool> logger, SessionPoolConfig config)
+    : SessionPool<TestSession>(logger, config)
+{
+    private volatile int _sessionIdCounter;
+
+    protected override Task<TestSession> CreateSession(CancellationToken cancellationToken = default)
+    {
+        var sessionId = $"test-session-{Interlocked.Increment(ref _sessionIdCounter)}";
+        var session = new TestSession(this, sessionId, nodeId: 1);
+        return Task.FromResult(session);
+    }
+}
+
+internal class TestSession : SessionBase<TestSession>
+{
+    internal TestSession(SessionPool<TestSession> sessionPool, string sessionId, long nodeId)
+        : base(sessionPool, sessionId, nodeId, NullLogger<TestSession>.Instance)
+    {
+    }
+
+    internal override Task<Status> DeleteSession() => Task.FromResult(Status.Success);
+}
diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/Ydb.Sdk.Ado.Benchmarks.csproj b/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Benchmarks/Ydb.Sdk.Ado.Benchmarks.csproj
@@ -0,0 +1,19 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="BenchmarkDotNet" Version="0.15.1"/>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="../../src/Ydb.Sdk.csproj"/>
+    </ItemGroup>
+</Project>
diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/Pool/ChannelPoolTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/Pool/ChannelPoolTests.cs
@@ -3,8 +3,8 @@
 using Grpc.Core;
 using Moq;
 using Xunit;
+using Ydb.Sdk.Ado.Pool;
 using Ydb.Sdk.Ado.Tests.Utils;
-using Ydb.Sdk.Pool;
 
 namespace Ydb.Sdk.Ado.Tests.Pool;
 
diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/Pool/EndpointPoolTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/Pool/EndpointPoolTests.cs
@@ -1,8 +1,8 @@
 using System.Collections.Immutable;
 using Moq;
 using Xunit;
+using Ydb.Sdk.Ado.Pool;
 using Ydb.Sdk.Ado.Tests.Utils;
-using Ydb.Sdk.Pool;
 
 namespace Ydb.Sdk.Ado.Tests.Pool;
 
diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbConnectionStringBuilderTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbConnectionStringBuilderTests.cs
@@ -13,6 +13,7 @@ public void InitDefaultValues_WhenEmptyConstructorInvoke_ReturnDefaultConnection
         Assert.Equal("localhost", ydbConnectionStringBuilder.Host);
         Assert.Equal("/local", ydbConnectionStringBuilder.Database);
         Assert.Equal(100, ydbConnectionStringBuilder.MaxSessionPool);
+        Assert.Equal(0, ydbConnectionStringBuilder.MinSessionPool);
         Assert.Null(ydbConnectionStringBuilder.User);
         Assert.Null(ydbConnectionStringBuilder.Password);
         Assert.Equal(5, ydbConnectionStringBuilder.ConnectTimeout);
@@ -25,6 +26,8 @@ public void InitDefaultValues_WhenEmptyConstructorInvoke_ReturnDefaultConnection
         Assert.False(ydbConnectionStringBuilder.DisableDiscovery);
         Assert.False(ydbConnectionStringBuilder.DisableServerBalancer);
         Assert.Equal(5, ydbConnectionStringBuilder.CreateSessionTimeout);
+        Assert.Equal(300, ydbConnectionStringBuilder.SessionIdleTimeout);
+        Assert.False(ydbConnectionStringBuilder.UseTls);
     }
 
     [Fact]
@@ -45,7 +48,8 @@ public void InitConnectionStringBuilder_WhenExpectedKeys_ReturnUpdatedConnection
             "ConnectTimeout=30;KeepAlivePingDelay=30;KeepAlivePingTimeout=60;" +
             "EnableMultipleHttp2Connections=true;CreateSessionTimeout=30;" +
             "MaxSendMessageSize=1000000;MaxReceiveMessageSize=1000000;" +
-            "DisableDiscovery=true;DisableServerBalancer=true"
+            "DisableDiscovery=true;DisableServerBalancer=true;" +
+            "SessionIdleTimeout=240;MinSessionPool=10;MaxSessionPool=50"
         );
 
         Assert.Equal(2135, connectionString.Port);
@@ -64,10 +68,14 @@ public void InitConnectionStringBuilder_WhenExpectedKeys_ReturnUpdatedConnection
                      "ConnectTimeout=30;KeepAlivePingDelay=30;KeepAlivePingTimeout=60;" +
                      "EnableMultipleHttp2Connections=True;CreateSessionTimeout=30;" +
                      "MaxSendMessageSize=1000000;MaxReceiveMessageSize=1000000;" +
-                     "DisableDiscovery=True;DisableServerBalancer=True", connectionString.ConnectionString);
+                     "DisableDiscovery=True;DisableServerBalancer=True" +
+                     "SessionIdleTimeout=240;MinSessionPool=10;MaxSessionPool=50", connectionString.ConnectionString);
         Assert.True(connectionString.DisableDiscovery);
         Assert.True(connectionString.DisableServerBalancer);
         Assert.Equal(30, connectionString.CreateSessionTimeout);
+        Assert.Equal(240, connectionString.SessionIdleTimeout);
+        Assert.Equal(10, connectionString.MinSessionPool);
+        Assert.Equal(50, connectionString.MaxSessionPool);
     }
 
     [Fact]
@@ -79,8 +87,7 @@ public void Host_WhenSetInProperty_ReturnUpdatedConnectionString()
         connectionString.Host = "new_server";
         Assert.Equal("new_server", connectionString.Host);
 
-        Assert.Equal("Host=new_server;Port=2135;Database=/my/path;User=Kirill",
-            connectionString.ConnectionString);
+        Assert.Equal("Host=new_server;Port=2135;Database=/my/path;User=Kirill", connectionString.ConnectionString);
     }
 
     [Fact]
diff --git a/src/YdbSdk.sln b/src/YdbSdk.sln

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Grpc.Net.Client;`
`7`	`7`	`using Microsoft.Extensions.Logging;`
`8`	`8`
`9`		`-namespace Ydb.Sdk.Pool;`
	`9`	`+namespace Ydb.Sdk.Ado.Pool;`
`10`	`10`
`11`	`11`	`internal class ChannelPool<T> : IAsyncDisposable where T : ChannelBase, IDisposable`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Collections.Immutable;`
`2`	`2`	`using Microsoft.Extensions.Logging;`
`3`	`3`
`4`		`-namespace Ydb.Sdk.Pool;`
	`4`	`+namespace Ydb.Sdk.Ado.Pool;`
`5`	`5`
`6`	`6`	`internal class EndpointPool`
`7`	`7`	`{`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +namespace Ydb.Sdk.Ado.Pool;
++
 +public class SessionPool
 +{
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ internal static class PoolManager`
`9`	`9`	`private static readonly SemaphoreSlim SemaphoreSlim = new(1); // async mutex`
`10`	`10`	`private static readonly ConcurrentDictionary<string, SessionPool> Pools = new();`
`11`	`11`
`12`		`- internal static async Task<Session> GetSession(`
	`12`	`+ internal static async Task<Services.Query.Session> GetSession(`
`13`	`13`	`YdbConnectionStringBuilder connectionString,`
`14`	`14`	`CancellationToken cancellationToken`
`15`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ private YdbConnectionStringBuilder ConnectionStringBuilder`
`24`	`24`	`[param: AllowNull] init => _connectionStringBuilder = value;`
`25`	`25`	`}`
`26`	`26`
`27`		`- internal Session Session`
	`27`	`+ internal Services.Query.Session Session`
`28`	`28`	`{`
`29`	`29`	`get`
`30`	`30`	`{`
`@@ -35,7 +35,7 @@ internal Session Session`
`35`	`35`	`private set => _session = value;`
`36`	`36`	`}`
`37`	`37`
`38`		`- private Session _session = null!;`
	`38`	`+ private Services.Query.Session _session = null!;`
`39`	`39`
`40`	`40`	`public YdbConnection()`
`41`	`41`	`{`