fix

Author: KirillKurdyukov

src/Ydb.Sdk/CHANGELOG.md

@@ -1,6 +1,6 @@
 - `YdbException`: Added cancellation token propagation support in `CommitAsync` and `RollbackAsync`.
-- Delete legacy exceptions: Driver.TransportException and StatusUnsuccessfulException.
-- Fixed bug: Unhandled exception System.Net.Http.HttpIOException convert to YdbException ([grpc-dotnet issue](https://github.com/grpc/grpc-dotnet/issues/2638)).
+- Deleted legacy exceptions: Driver.TransportException, StatusUnsuccessfulException and InitializationFailureException.
+- Fixed bug: Unhandled exception System.Net.Http.HttpIOException has now been converted to YdbException ([grpc-dotnet issue](https://github.com/grpc/grpc-dotnet/issues/2638)).
 - Added 'x-ydb-client-pid' header to any RPC calls.
 - Added DisableServerBalancer option to ADO.NET session creation; default false.
 

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

@@ -14,16 +14,8 @@ public static class StatusCodeUtils
         _ => StatusCode.ClientTransportUnknown
     };
 
-    internal static StatusCode Code(this StatusIds.Types.StatusCode statusCode)
-    {
-        var value = (uint)statusCode;
-        if (Enum.IsDefined(typeof(StatusCode), value))
-        {
-            return (StatusCode)value;
-        }
-
-        return StatusCode.Unspecified;
-    }
+    internal static StatusCode Code(this StatusIds.Types.StatusCode statusCode) =>
+        Enum.IsDefined(typeof(StatusCode), (int)statusCode) ? (StatusCode)statusCode : StatusCode.Unavailable;
 
     internal static bool IsNotSuccess(this StatusIds.Types.StatusCode code) =>
         code != StatusIds.Types.StatusCode.Success;

src/Ydb.Sdk/src/Ado/YdbException.cs

@@ -20,7 +20,7 @@ internal static YdbException FromServer(StatusIds.Types.StatusCode statusCode, I
         var code = statusCode.Code();
 
         var message = code.ToMessage(issues);
-        
+
         return new YdbException(code, message);
     }
 

src/Ydb.Sdk/src/Driver.cs

@@ -4,6 +4,8 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Ydb.Discovery;
 using Ydb.Discovery.V1;
+using Ydb.Sdk.Ado;
+using Ydb.Sdk.Ado.Internal;
 using Ydb.Sdk.Pool;
 
 namespace Ydb.Sdk;
@@ -39,19 +41,15 @@ public async Task Initialize()
         {
             try
             {
-                var status = await DiscoverEndpoints();
-                if (status.IsSuccess)
-                {
-                    _ = Task.Run(PeriodicDiscovery);
-
-                    return;
-                }
+                await DiscoverEndpoints();
 
-                Logger.LogCritical("Error during initial endpoint discovery: {status}", status);
+                _ = Task.Run(PeriodicDiscovery);
+                
+                return;
             }
-            catch (RpcException e)
+            catch (YdbException e)
             {
-                Logger.LogCritical("RPC error during initial endpoint discovery: {e.Status}", e.Status);
+                Logger.LogError(e, "RPC error during initial endpoint discovery: {e.Status}", e.Code);
 
                 if (i == AttemptDiscovery - 1)
                 {
@@ -62,7 +60,7 @@ public async Task Initialize()
             await Task.Delay(TimeSpan.FromMilliseconds(i * 200)); // await 0 ms, 200 ms, 400ms, ... 1.8 sec
         }
 
-        throw new InitializationFailureException("Error during initial endpoint discovery");
+        throw new YdbException("Error during initial endpoint discovery");
     }
 
     protected override string GetEndpoint(long nodeId) => _endpointPool.GetEndpoint(nodeId);
@@ -90,7 +88,7 @@ Grpc.Core.StatusCode.DeadlineExceeded or
         _ = Task.Run(DiscoverEndpoints);
     }
 
-    private async Task<Status> DiscoverEndpoints()
+    private async Task DiscoverEndpoints()
     {
         using var channel = GrpcChannelFactory.CreateChannel(Config.Endpoint);
 
@@ -111,30 +109,13 @@ private async Task<Status> DiscoverEndpoints()
             options: await GetCallOptions(requestSettings)
         );
 
-        if (!response.Operation.Ready)
+        var operation = response.Operation;
+        if (operation.Status.IsNotSuccess())
         {
-            const string error = "Unexpected non-ready endpoint discovery operation.";
-            Logger.LogError($"Endpoint discovery internal error: {error}");
-
-            return new Status(StatusCode.ClientInternalError, error);
+            throw YdbException.FromServer(operation.Status, operation.Issues);
         }
 
-        var status = Status.FromProto(response.Operation.Status, response.Operation.Issues);
-        if (status.IsNotSuccess)
-        {
-            Logger.LogWarning("Unsuccessful endpoint discovery: {Status}", status);
-            return status;
-        }
-
-        if (response.Operation.Result is null)
-        {
-            const string error = "Unexpected empty endpoint discovery result.";
-            Logger.LogError($"Endpoint discovery internal error: {error}");
-
-            return new Status(StatusCode.ClientInternalError, error);
-        }
-
-        var resultProto = response.Operation.Result.Unpack<ListEndpointsResult>();
+        var resultProto = operation.Result.Unpack<ListEndpointsResult>();
 
         Logger.LogDebug(
             "Successfully discovered endpoints: {EndpointsCount}, self location: {SelfLocation}, sdk info: {SdkInfo}",
@@ -151,8 +132,6 @@ await ChannelPool.RemoveChannels(
                 .ToImmutableArray()
             )
         );
-
-        return new Status(StatusCode.Success);
     }
 
     private async Task PeriodicDiscovery()
@@ -163,23 +142,16 @@ private async Task PeriodicDiscovery()
             {
                 await Task.Delay(Config.EndpointDiscoveryInterval);
 
-                _ = await DiscoverEndpoints();
+                await DiscoverEndpoints();
             }
-            catch (RpcException e)
+            catch (YdbException e)
             {
-                Logger.LogWarning("RPC error during endpoint discovery: {Status}", e.Status);
+                Logger.LogWarning(e, "Error during endpoint discovery");
             }
             catch (Exception e)
             {
                 Logger.LogError(e, "Unexpected exception during session pool periodic check");
             }
         }
     }
-
-    public class InitializationFailureException : Exception
-    {
-        internal InitializationFailureException(string message) : base(message)
-        {
-        }
-    }
 }

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

@@ -1,4 +1,3 @@
-using Ydb.Sdk.Ado;
 using Ydb.Sdk.Client;
 using Ydb.Sdk.Services.Operations;
 using Ydb.Table;

src/Ydb.Sdk/src/Status.cs

@@ -207,10 +207,9 @@ public override string ToString()
 
     private static StatusCode ConvertStatusCode(StatusIds.Types.StatusCode statusCode)
     {
-        var value = (uint)statusCode;
-        if (Enum.IsDefined(typeof(StatusCode), value))
+        if (Enum.IsDefined(typeof(StatusCode), (int)statusCode))
         {
-            return (StatusCode)value;
+            return (StatusCode)statusCode;
         }
 
         return StatusCode.Unspecified;

src/Ydb.Sdk/src/Value/YdbValue.cs

@@ -1,6 +1,6 @@
 namespace Ydb.Sdk.Value;
 
-public enum YdbTypeId : uint
+public enum YdbTypeId
 {
     Unknown = 0,
 
@@ -45,7 +45,7 @@ public enum YdbTypeId : uint
 
 internal static class YdbTypeIdRanges
 {
-    public const uint ComplexTypesFirst = 0xffff;
+    public const int ComplexTypesFirst = 0xffff;
 }
 
 public sealed partial class YdbValue
@@ -85,7 +85,7 @@ private static string ToYql(Type type) =>
     internal static YdbTypeId GetYdbTypeId(Type protoType) =>
         protoType.TypeCase switch
         {
-            Type.TypeOneofCase.TypeId => Enum.IsDefined(typeof(YdbTypeId), (uint)protoType.TypeId)
+            Type.TypeOneofCase.TypeId => Enum.IsDefined(typeof(YdbTypeId), (int)protoType.TypeId)
                 ? (YdbTypeId)protoType.TypeId
                 : YdbTypeId.Unknown,
             Type.TypeOneofCase.DecimalType => YdbTypeId.DecimalType,