Delete ClientBase.cs (#85)

* Make ClientBase abstract class

* Delete ClientBase.cs

* fix linter

* fix linter

Author: KirillKurdyukov

src/Ydb.Sdk/src/Client/ClientBase.cs

@@ -40,6 +40,11 @@ public static async Task<Driver> CreateInitialized(DriverConfig config, ILoggerF
 
     public ILoggerFactory LoggerFactory { get; }
 
+    ~Driver()
+    {
+        Dispose(_disposed);
+    }
+
     public void Dispose()
     {
         Dispose(true);

src/Ydb.Sdk/src/Driver.cs

@@ -1,4 +1,7 @@
-namespace Ydb.Sdk;
+using Google.Protobuf.WellKnownTypes;
+using Ydb.Operations;
+
+namespace Ydb.Sdk;
 
 public class RequestSettings
 {
@@ -10,4 +13,16 @@ public class RequestSettings
 public class OperationRequestSettings : RequestSettings
 {
     public TimeSpan? OperationTimeout { get; set; }
+
+    internal OperationParams MakeOperationParams()
+    {
+        var opParams = new OperationParams();
+
+        if (OperationTimeout != null)
+        {
+            opParams.OperationTimeout = Duration.FromTimeSpan(OperationTimeout.Value);
+        }
+
+        return opParams;
+    }
 }

src/Ydb.Sdk/src/RequestSettings.cs

@@ -1,10 +1,11 @@
-using Ydb.Sdk.Client;
-
 namespace Ydb.Sdk.Services.Auth;
 
-public partial class AuthClient : ClientBase
+public partial class AuthClient
 {
-    public AuthClient(Driver driver) : base(driver)
+    private readonly Driver _driver;
+
+    public AuthClient(Driver driver)
     {
+        _driver = driver;
     }
 }

src/Ydb.Sdk/src/Services/Auth/AuthClient.cs

@@ -1,6 +1,7 @@
 using Ydb.Auth;
 using Ydb.Auth.V1;
 using Ydb.Sdk.Client;
+using Ydb.Sdk.Services.Operations;
 
 namespace Ydb.Sdk.Services.Auth;
 
@@ -39,7 +40,7 @@ public async Task<LoginResponse> Login(string user, string? password, LoginSetti
         settings ??= new LoginSettings();
         var request = new LoginRequest
         {
-            OperationParams = MakeOperationParams(settings),
+            OperationParams = settings.MakeOperationParams(),
             User = user
         };
         if (password is not null)
@@ -49,13 +50,13 @@ public async Task<LoginResponse> Login(string user, string? password, LoginSetti
 
         try
         {
-            var response = await Driver.UnaryCall(
+            var response = await _driver.UnaryCall(
                 method: AuthService.LoginMethod,
                 request: request,
                 settings: settings
             );
 
-            var status = UnpackOperation(response.Data.Operation, out LoginResult? resultProto);
+            var status = response.Data.Operation.TryUnpack(out LoginResult? resultProto);
 
             LoginResponse.ResultData? result = null;
 

src/Ydb.Sdk/src/Services/Auth/Login.cs

@@ -0,0 +1,32 @@
+using Google.Protobuf;
+using Ydb.Sdk.Client;
+
+namespace Ydb.Sdk.Services.Operations;
+
+internal static class OperationExtensions
+{
+    internal static Status Unpack(this Ydb.Operations.Operation operationProto)
+    {
+        var operation = ClientOperation.FromProto(operationProto);
+        operation.EnsureReady();
+
+        return operation.Status;
+    }
+
+    internal static Status TryUnpack<TResult>(this Ydb.Operations.Operation operationProto, out TResult? result)
+        where TResult : class, IMessage, new()
+    {
+        var operation = ClientOperation.FromProto(operationProto);
+        operation.EnsureReady();
+
+        var status = operation.Status;
+        result = null;
+
+        if (operation.HasResult)
+        {
+            result = operation.UnpackResult<TResult>();
+        }
+
+        return status;
+    }
+}

src/Ydb.Sdk/src/Services/Operations/OperationExtensions.cs

@@ -27,7 +27,7 @@ public QueryClient(Driver driver, QueryClientConfig? config = null) : base(drive
     {
         config ??= new QueryClientConfig();
 
-        _logger = Driver.LoggerFactory.CreateLogger<QueryClient>();
+        _logger = driver.LoggerFactory.CreateLogger<QueryClient>();
 
         _sessionPool = new SessionPool(driver, config.SessionPoolConfig);
     }

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

@@ -1,16 +1,18 @@
 using Microsoft.Extensions.Logging;
 using Ydb.Query;
 using Ydb.Query.V1;
-using Ydb.Sdk.Client;
 using Ydb.Sdk.Value;
 
 namespace Ydb.Sdk.Services.Query;
 
-public abstract class QueryClientGrpc : ClientBase
+public abstract class QueryClientGrpc
 {
-    private protected QueryClientGrpc(Driver driver) : base(driver)
+    private readonly Driver _driver;
+
+    private protected QueryClientGrpc(Driver driver)
     {
-        Driver.LoggerFactory.CreateLogger<QueryClient>();
+        _driver = driver;
+        _driver.LoggerFactory.CreateLogger<QueryClient>();
     }
 
     internal async Task<CreateSessionResponse> CreateSession(CreateSessionSettings? settings = null)
@@ -20,7 +22,7 @@ internal async Task<CreateSessionResponse> CreateSession(CreateSessionSettings?
 
         try
         {
-            var response = await Driver.UnaryCall(
+            var response = await _driver.UnaryCall(
                 method: QueryService.CreateSessionMethod,
                 request: request,
                 settings: settings);
@@ -31,7 +33,7 @@ internal async Task<CreateSessionResponse> CreateSession(CreateSessionSettings?
 
             if (status.IsSuccess)
             {
-                result = CreateSessionResponse.ResultData.FromProto(response.Data, Driver, response.UsedEndpoint);
+                result = CreateSessionResponse.ResultData.FromProto(response.Data, _driver, response.UsedEndpoint);
             }
 
             return new CreateSessionResponse(status, result);
@@ -52,11 +54,11 @@ internal async Task<DeleteSessionResponse> DeleteSession(string sessionId, Delet
 
         try
         {
-            var response = await Driver.UnaryCall(
+            var response = await _driver.UnaryCall(
                 method: QueryService.DeleteSessionMethod,
                 request: request,
-                settings: settings);
-
+                settings: settings
+            );
 
             return DeleteSessionResponse.FromProto(response.Data);
         }
@@ -72,7 +74,7 @@ internal SessionStateStream AttachSession(string sessionId, AttachSessionSetting
 
         var request = new AttachSessionRequest { SessionId = sessionId };
 
-        var streamIterator = Driver.StreamCall(
+        var streamIterator = _driver.StreamCall(
             method: QueryService.AttachSessionMethod,
             request: request,
             settings: settings
@@ -90,11 +92,12 @@ private protected async Task<BeginTransactionResponse> BeginTransaction(
         var request = new BeginTransactionRequest { SessionId = sessionId, TxSettings = tx.ToProto().BeginTx };
         try
         {
-            var response = await Driver.UnaryCall(
+            var response = await _driver.UnaryCall(
                 QueryService.BeginTransactionMethod,
                 request: request,
                 settings: settings
             );
+
             return BeginTransactionResponse.FromProto(response.Data, this, sessionId);
         }
         catch (Driver.TransportException e)
@@ -114,11 +117,12 @@ private protected async Task<CommitTransactionResponse> CommitTransaction(
 
         try
         {
-            var response = await Driver.UnaryCall(
+            var response = await _driver.UnaryCall(
                 QueryService.CommitTransactionMethod,
                 request: request,
                 settings: settings
             );
+
             return CommitTransactionResponse.FromProto(response.Data);
         }
         catch (Driver.TransportException e)
@@ -137,7 +141,7 @@ private protected async Task<RollbackTransactionResponse> RollbackTransaction(
         var request = new RollbackTransactionRequest { SessionId = sessionId, TxId = tx.TxId };
         try
         {
-            var response = await Driver.UnaryCall(
+            var response = await _driver.UnaryCall(
                 QueryService.RollbackTransactionMethod,
                 request: request,
                 settings: settings
@@ -172,7 +176,7 @@ protected internal ExecuteQueryStream ExecuteQuery(
 
         request.Parameters.Add(parameters.ToDictionary(p => p.Key, p => p.Value.GetProto()));
 
-        var streamIterator = Driver.StreamCall(
+        var streamIterator = _driver.StreamCall(
             method: QueryService.ExecuteQueryMethod,
             request: request,
             settings: settings);

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

@@ -6,22 +6,20 @@ namespace Ydb.Sdk.Services.Query;
 using GetSessionResponse = GetSessionResponse<Session>;
 using NoPool = NoPool<Session>;
 
-internal class SessionPool : SessionPoolBase<Session, QueryClient>
+internal class SessionPool : SessionPoolBase<Session>
 {
     private readonly Dictionary<string, CancellationTokenSource> _attachedSessions = new();
+    private readonly QueryClient _client;
 
     public SessionPool(Driver driver, SessionPoolConfig config) :
-        base(
-            driver: driver,
-            config: config,
-            client: new QueryClient(driver, new NoPool()),
-            logger: driver.LoggerFactory.CreateLogger<SessionPool>())
+        base(driver, config, driver.LoggerFactory.CreateLogger<SessionPool>())
     {
+        _client = new QueryClient(driver, new NoPool());
     }
 
     private protected override async Task<GetSessionResponse> CreateSession()
     {
-        var createSessionResponse = await Client.CreateSession(new CreateSessionSettings
+        var createSessionResponse = await _client.CreateSession(new CreateSessionSettings
             { TransportTimeout = Config.CreateSessionTimeout });
 
         lock (Lock)
@@ -54,7 +52,7 @@ private protected override async Task<GetSessionResponse> CreateSession()
 
     private async Task AttachAndMonitor(string sessionId)
     {
-        var stream = Client.AttachSession(sessionId);
+        var stream = _client.AttachSession(sessionId);
 
         var cts = new CancellationTokenSource();
         cts.CancelAfter(Config.CreateSessionTimeout);
@@ -157,7 +155,7 @@ private protected override async Task DeleteSession(string id)
     {
         DetachSession(id);
 
-        await Client.DeleteSession(id, new DeleteSessionSettings
+        await _client.DeleteSession(id, new DeleteSessionSettings
         {
             TransportTimeout = SessionBase.DeleteSessionTimeout
         });

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

@@ -1,6 +1,7 @@
 using Ydb.Scheme;
 using Ydb.Scheme.V1;
 using Ydb.Sdk.Client;
+using Ydb.Sdk.Services.Operations;
 
 namespace Ydb.Sdk.Services.Scheme;
 
@@ -117,11 +118,13 @@ internal static ResultData FromProto(ListDirectoryResult resultProto)
     }
 }
 
-public class SchemeClient : ClientBase
+public class SchemeClient
 {
+    private readonly Driver _driver;
+
     public SchemeClient(Driver driver)
-        : base(driver)
     {
+        _driver = driver;
     }
 
     public async Task<ListDirectoryResponse> ListDirectory(string path, ListDirectorySettings? settings = null)
@@ -130,19 +133,19 @@ public async Task<ListDirectoryResponse> ListDirectory(string path, ListDirector
 
         var request = new ListDirectoryRequest
         {
-            OperationParams = MakeOperationParams(settings),
+            OperationParams = settings.MakeOperationParams(),
             Path = path
         };
 
         try
         {
-            var response = await Driver.UnaryCall(
+            var response = await _driver.UnaryCall(
                 method: SchemeService.ListDirectoryMethod,
                 request: request,
-                settings: settings);
+                settings: settings
+            );
 
-            ListDirectoryResult? resultProto;
-            var status = UnpackOperation(response.Data.Operation, out resultProto);
+            var status = response.Data.Operation.TryUnpack(out ListDirectoryResult? resultProto);
 
             ListDirectoryResponse.ResultData? result = null;
             if (status.IsSuccess && resultProto != null)