Skip to content

Commit 08a57ab

Browse files
KirillKurdyukovKirillKurdyukov
committed
init commit
1 parent 8986cba commit 08a57ab

39 files changed

+532
-572
lines changed

‎src/Ydb.Sdk/CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
- Added 'x-ydb-client-pid' header to any RPC calls
1+
- `YdbException`: Added cancellation token propagation support in `CommitAsync` and `RollbackAsync`.
2+
- Delete legacy exceptions: Driver.TransportException and StatusUnsuccessfulException.
3+
- Fixed bug: Unhandled exception System.Net.Http.HttpIOException convert to YdbException ([grpc-dotnet issue](https://github.com/grpc/grpc-dotnet/issues/2638)).
4+
- Added 'x-ydb-client-pid' header to any RPC calls.
25
- Added DisableServerBalancer option to ADO.NET session creation; default false.
36

47
## v0.20.1

‎src/Ydb.Sdk/src/Ado/Internal/IssueMessageUtils.cs‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
using System.Text;
2+
using Ydb.Issue;
3+
4+
namespace Ydb.Sdk.Ado.Internal;
5+
6+
internal static class IssueMessageUtils
7+
{
8+
internal static string IssuesToString(this IReadOnlyList<IssueMessage> issues) => IssuesToString(issues, 0, 4);
9+
10+
private static string IssuesToString(IEnumerable<IssueMessage> issueMessages, int currentIndent, int indent)
11+
{
12+
var sb = new StringBuilder();
13+
14+
foreach (var message in issueMessages)
15+
{
16+
sb.Append(' ', currentIndent);
17+
sb.Append($"[{message.IssueCode}] ");
18+
19+
if (message.Position != null)
20+
{
21+
sb.Append(message.Position.PositionToString());
22+
}
23+
24+
sb.Append($"{message.Severity.SeverityToString()}: ");
25+
sb.Append(message.Message);
26+
sb.Append(IssuesToString(message.Issues, currentIndent + indent, indent));
27+
sb.Append(Environment.NewLine);
28+
}
29+
30+
return sb.ToString();
31+
}
32+
33+
private static string SeverityToString(this uint severity) => severity switch
34+
{
35+
0 => "Fatal",
36+
1 => "Error",
37+
2 => "Warning",
38+
3 => "Info",
39+
_ => $"Unknown severity {severity}"
40+
};
41+
42+
private static string PositionToString(this IssueMessage.Types.Position position)
43+
{
44+
var sb = new StringBuilder();
45+
sb.Append('(');
46+
47+
if (position.File != null)
48+
{
49+
sb.Append(position.File);
50+
sb.Append(':');
51+
}
52+
53+
sb.Append($"{position.Row}:{position.Column}");
54+
sb.Append(')');
55+
return sb.ToString();
56+
}
57+
}

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using Ydb.Issue;
2+
3+
namespace Ydb.Sdk.Ado.Internal;
4+
5+
public static class StatusCodeUtils
6+
{
7+
internal static StatusCode Code(this Grpc.Core.Status rpcStatus) => rpcStatus.StatusCode switch
8+
{
9+
Grpc.Core.StatusCode.Unavailable => StatusCode.ClientTransportUnavailable,
10+
Grpc.Core.StatusCode.DeadlineExceeded => StatusCode.ClientTransportTimeout,
11+
Grpc.Core.StatusCode.ResourceExhausted => StatusCode.ClientTransportResourceExhausted,
12+
Grpc.Core.StatusCode.Unimplemented => StatusCode.ClientTransportUnimplemented,
13+
Grpc.Core.StatusCode.Cancelled => StatusCode.Cancelled,
14+
_ => StatusCode.ClientTransportUnknown
15+
};
16+
17+
internal static StatusCode Code(this StatusIds.Types.StatusCode statusCode)
18+
{
19+
var value = (uint)statusCode;
20+
if (Enum.IsDefined(typeof(StatusCode), value))
21+
{
22+
return (StatusCode)value;
23+
}
24+
25+
return StatusCode.Unspecified;
26+
}
27+
28+
internal static bool IsNotSuccess(this StatusIds.Types.StatusCode code) =>
29+
code != StatusIds.Types.StatusCode.Success;
30+
31+
internal static string ToMessage(this StatusCode statusCode, IReadOnlyList<IssueMessage> issueMessages) =>
32+
issueMessages.Count == 0
33+
? $"Status: {statusCode}"
34+
: $"Status: {statusCode}, Issues:{Environment.NewLine}{issueMessages.IssuesToString()}";
35+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
219219
var ydbDataReader = await YdbDataReader.CreateYdbDataReader(
220220
await YdbConnection.Session
221221
.ExecuteQuery(preparedSql.ToString(), ydbParameters, execSettings, transaction?.TransactionControl),
222-
YdbConnection.OnStatus, transaction, cancellationToken
222+
YdbConnection.OnNotSuccessStatusCode, transaction, cancellationToken
223223
);
224224

225225
YdbConnection.LastReader = ydbDataReader;

‎src/Ydb.Sdk/src/Ado/YdbConnection.cs‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,24 +92,7 @@ public override async Task OpenAsync(CancellationToken cancellationToken)
9292
{
9393
ThrowIfConnectionOpen();
9494

95-
try
96-
{
97-
Session = await PoolManager.GetSession(ConnectionStringBuilder, cancellationToken);
98-
}
99-
catch (Exception e)
100-
{
101-
throw e switch
102-
{
103-
OperationCanceledException => throw new YdbException(StatusCode.Cancelled,
104-
$"The connection pool has been exhausted, either raise 'MaxSessionPool' " +
105-
$"(currently {ConnectionStringBuilder.MaxSessionPool}) or 'CreateSessionTimeout' " +
106-
$"(currently {ConnectionStringBuilder.CreateSessionTimeout} seconds) in your connection string.", e
107-
),
108-
Driver.TransportException transportException => new YdbException(transportException),
109-
StatusUnsuccessfulException unsuccessfulException => new YdbException(unsuccessfulException.Status),
110-
_ => e
111-
};
112-
}
95+
Session = await PoolManager.GetSession(ConnectionStringBuilder, cancellationToken);
11396

11497
OnStateChange(ClosedToOpenEventArgs);
11598

@@ -165,9 +148,9 @@ public override string ConnectionString
165148

166149
private ConnectionState ConnectionState { get; set; } = ConnectionState.Closed; // Invoke AsyncOpen()
167150

168-
internal void OnStatus(Status status)
151+
internal void OnNotSuccessStatusCode(StatusCode code)
169152
{
170-
_session.OnStatus(status);
153+
_session.OnNotSuccessStatusCode(code);
171154

172155
if (!_session.IsActive)
173156
{

‎src/Ydb.Sdk/src/Ado/YdbDataReader.cs‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Google.Protobuf.Collections;
33
using Ydb.Issue;
44
using Ydb.Query;
5+
using Ydb.Sdk.Ado.Internal;
56
using Ydb.Sdk.Value;
67

78
namespace Ydb.Sdk.Ado;
@@ -11,7 +12,7 @@ public sealed class YdbDataReader : DbDataReader, IAsyncEnumerable<YdbDataRecord
1112
private readonly IServerStream<ExecuteQueryResponsePart> _stream;
1213
private readonly YdbTransaction? _ydbTransaction;
1314
private readonly RepeatedField<IssueMessage> _issueMessagesInStream = new();
14-
private readonly Action<Status> _onNotSuccessStatus;
15+
private readonly Action<StatusCode> _onNotSuccessStatusCode;
1516

1617
private int _currentRowIndex = -1;
1718
private long _resultSetIndex = -1;
@@ -54,17 +55,17 @@ private enum State
5455

5556
private YdbDataReader(
5657
IServerStream<ExecuteQueryResponsePart> resultSetStream,
57-
Action<Status> onNotSuccessStatus,
58+
Action<StatusCode> onNotSuccessStatusCode,
5859
YdbTransaction? ydbTransaction)
5960
{
6061
_stream = resultSetStream;
61-
_onNotSuccessStatus = onNotSuccessStatus;
62+
_onNotSuccessStatusCode = onNotSuccessStatusCode;
6263
_ydbTransaction = ydbTransaction;
6364
}
6465

6566
internal static async Task<YdbDataReader> CreateYdbDataReader(
6667
IServerStream<ExecuteQueryResponsePart> resultSetStream,
67-
Action<Status> onStatus,
68+
Action<StatusCode> onStatus,
6869
YdbTransaction? ydbTransaction = null,
6970
CancellationToken cancellationToken = default
7071
)
@@ -522,7 +523,7 @@ public override async Task CloseAsync()
522523
return;
523524
}
524525

525-
_onNotSuccessStatus(new Status(StatusCode.SessionBusy));
526+
_onNotSuccessStatusCode(StatusCode.SessionBusy);
526527
_stream.Dispose();
527528

528529
if (_ydbTransaction != null)
@@ -559,20 +560,14 @@ private async ValueTask<State> NextExecPart(CancellationToken cancellationToken)
559560

560561
_issueMessagesInStream.AddRange(part.Issues);
561562

562-
if (part.Status != StatusIds.Types.StatusCode.Success)
563+
if (part.Status.IsNotSuccess())
563564
{
564-
OnFailReadStream();
565-
566565
while (await _stream.MoveNextAsync(cancellationToken))
567566
{
568567
_issueMessagesInStream.AddRange(_stream.Current.Issues);
569568
}
570569

571-
var status = Status.FromProto(part.Status, _issueMessagesInStream);
572-
573-
_onNotSuccessStatus(status);
574-
575-
throw new YdbException(status);
570+
throw YdbException.FromServer(part.Status, _issueMessagesInStream);
576571
}
577572

578573
_currentResultSet = part.ResultSet?.FromProto();
@@ -592,13 +587,13 @@ private async ValueTask<State> NextExecPart(CancellationToken cancellationToken)
592587

593588
return State.NewResultSet;
594589
}
595-
catch (Driver.TransportException e)
590+
catch (YdbException e)
596591
{
597592
OnFailReadStream();
598593

599-
_onNotSuccessStatus(e.Status);
594+
_onNotSuccessStatusCode(e.Code);
600595

601-
throw new YdbException(e);
596+
throw;
602597
}
603598
}
604599

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
using System.Data.Common;
2+
using Grpc.Core;
3+
using Ydb.Issue;
4+
using Ydb.Sdk.Ado.Internal;
25

36
namespace Ydb.Sdk.Ado;
47

@@ -8,14 +11,17 @@ internal YdbException(string message) : base(message)
811
{
912
}
1013

11-
internal YdbException(Driver.TransportException transportException)
12-
: this(transportException.Status, transportException)
14+
internal YdbException(RpcException e) : this(e.Status.Code(), "Transport RPC call error", e)
1315
{
1416
}
1517

16-
internal YdbException(Status status, Exception? innerException = null)
17-
: this(status.StatusCode, status.ToString(), innerException)
18+
internal static YdbException FromServer(StatusIds.Types.StatusCode statusCode, IReadOnlyList<IssueMessage> issues)
1819
{
20+
var code = statusCode.Code();
21+
22+
var message = code.ToMessage(issues);
23+
24+
return new YdbException(code, message);
1925
}
2026

2127
internal YdbException(StatusCode statusCode, string message, Exception? innerException = null)

‎src/Ydb.Sdk/src/Ado/YdbSchema.cs‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Ydb.Scheme.V1;
66
using Ydb.Sdk.Ado.Schema;
77
using Ydb.Sdk.Services.Table;
8-
using Ydb.Table;
98

109
namespace Ydb.Sdk.Ado;
1110

@@ -63,24 +62,13 @@ public static async Task<YdbTable> DescribeTable(
6362
var describeResponse = await ydbConnection.Session
6463
.DescribeTable(WithSuffix(ydbConnection.Database) + tableName, describeTableSettings);
6564

66-
var status = Status.FromProto(describeResponse.Operation.Status, describeResponse.Operation.Issues);
67-
68-
if (status.IsNotSuccess)
69-
{
70-
ydbConnection.OnStatus(status);
71-
72-
throw new YdbException(status);
73-
}
74-
75-
var describeRes = describeResponse.Operation.Result.Unpack<DescribeTableResult>();
76-
77-
return new YdbTable(tableName, describeRes);
65+
return new YdbTable(tableName, describeResponse);
7866
}
79-
catch (Driver.TransportException e)
67+
catch (YdbException e)
8068
{
81-
ydbConnection.OnStatus(e.Status);
69+
ydbConnection.OnNotSuccessStatusCode(e.Code);
8270

83-
throw new YdbException(e);
71+
throw;
8472
}
8573
}
8674

@@ -253,19 +241,31 @@ private static async Task AppendDescribeTable(
253241
string? tableType,
254242
Action<YdbTable, string> appendInTable)
255243
{
256-
var ydbTable = await DescribeTable(ydbConnection, tableName, describeTableSettings);
257-
var type = ydbTable.IsSystem
258-
? "SYSTEM_TABLE"
259-
: ydbTable.Type switch
244+
try
245+
{
246+
var describeResponse = await ydbConnection.Session
247+
.DescribeTable(WithSuffix(ydbConnection.Database) + tableName, describeTableSettings);
248+
var ydbTable = new YdbTable(tableName, describeResponse);
249+
250+
var type = ydbTable.IsSystem
251+
? "SYSTEM_TABLE"
252+
: ydbTable.Type switch
253+
{
254+
YdbTable.TableType.Table => "TABLE",
255+
YdbTable.TableType.ColumnTable => "COLUMN_TABLE",
256+
YdbTable.TableType.ExternalTable => "EXTERNAL_TABLE",
257+
_ => throw new ArgumentOutOfRangeException(nameof(tableType))
258+
};
259+
if (type.IsPattern(tableType))
260260
{
261-
YdbTable.TableType.Table => "TABLE",
262-
YdbTable.TableType.ColumnTable => "COLUMN_TABLE",
263-
YdbTable.TableType.ExternalTable => "EXTERNAL_TABLE",
264-
_ => throw new ArgumentOutOfRangeException(nameof(tableType))
265-
};
266-
if (type.IsPattern(tableType))
261+
appendInTable(ydbTable, type);
262+
}
263+
}
264+
catch (YdbException e)
267265
{
268-
appendInTable(ydbTable, type);
266+
ydbConnection.OnNotSuccessStatusCode(e.Code);
267+
268+
throw;
269269
}
270270
}
271271

@@ -417,7 +417,7 @@ CancellationToken cancellationToken
417417

418418
if (status.IsNotSuccess)
419419
{
420-
throw new YdbException(status);
420+
throw YdbException.FromServer(operation.Status, operation.Issues);
421421
}
422422

423423
foreach (var entry in operation.Result.Unpack<ListDirectoryResult>().Children)
@@ -461,9 +461,11 @@ await SchemaObjects(
461461

462462
return ydbSchemaObjects;
463463
}
464-
catch (Driver.TransportException e)
464+
catch (YdbException e)
465465
{
466-
throw new YdbException(e);
466+
ydbConnection.OnNotSuccessStatusCode(e.Code);
467+
468+
throw;
467469
}
468470
}
469471

0 commit comments

Comments
 (0)