From f866b7132220a9a2c9508f14892785afa37a89f3 Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Tue, 17 Dec 2024 15:47:25 +0300 Subject: [PATCH 1/3] Revert "Release v0.9.v0.9.1" This reverts commit a47f6cd57a5a7974fcd1e7e1f3d7854a0e84ccfd. --- CHANGELOG.md | 1 - src/Ydb.Sdk/src/Version.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a75dd88..3f7a85a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ -## v0.9.v0.9.1 - Fixed bug: delete deadline grpc timeout on AttachStream ## v0.9.1 diff --git a/src/Ydb.Sdk/src/Version.cs b/src/Ydb.Sdk/src/Version.cs index 0df4072f..df1a1d49 100644 --- a/src/Ydb.Sdk/src/Version.cs +++ b/src/Ydb.Sdk/src/Version.cs @@ -4,5 +4,5 @@ public static class Version { public const uint Major = 0; public const uint Minor = 9; - public const uint Patch = v0.9.1; + public const uint Patch = 1; } From 93530f0b978dc5be7142fdfb574c4cff14f42c0a Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Thu, 19 Dec 2024 19:13:54 +0300 Subject: [PATCH 2/3] dev: fix flap tests (run processing ack may not be able to start on time) --- src/Ydb.Sdk/tests/Topic/WriterUnitTests.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Ydb.Sdk/tests/Topic/WriterUnitTests.cs b/src/Ydb.Sdk/tests/Topic/WriterUnitTests.cs index 673cf8e3..a2c1f667 100644 --- a/src/Ydb.Sdk/tests/Topic/WriterUnitTests.cs +++ b/src/Ydb.Sdk/tests/Topic/WriterUnitTests.cs @@ -130,7 +130,8 @@ public async Task Initialize_WhenFailWriteMessage_ShouldRetryInitializeAndReturn Assert.Equal(PersistenceStatus.Written, (await writer.WriteAsync("abacaba")).Status); // check attempt repeated!!! - _mockStream.Verify(stream => stream.Write(It.IsAny()), Times.Exactly(3)); + _mockStream.Verify(stream => stream.Write(It.IsAny()), + Times.AtLeast(2)); // run processing ack may not be able to start on time _mockStream.Verify(stream => stream.MoveNextAsync(), Times.Exactly(3)); _mockStream.Verify(stream => stream.Current, Times.Exactly(2)); } @@ -178,7 +179,8 @@ public async Task Initialize_WhenFailMoveNextAsync_ShouldRetryInitializeAndRetur // check attempt repeated!!! _mockStream.Verify(stream => stream.Write(It.IsAny()), Times.Exactly(3)); - _mockStream.Verify(stream => stream.MoveNextAsync(), Times.Exactly(4)); + _mockStream.Verify(stream => stream.MoveNextAsync(), + Times.AtLeast(3)); // run processing ack may not be able to start on time _mockStream.Verify(stream => stream.Current, Times.Exactly(2)); } From 17c7d2d0480e7ea910c39a7b75eaf69e3ff7290a Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Thu, 19 Dec 2024 19:24:48 +0300 Subject: [PATCH 3/3] Ado.Net NextResultAsync on skipping any more messages in ExecuteScalarAsync & ExecuteNonQueryAsync (will faster and safety) --- src/Ydb.Sdk/src/Ado/YdbCommand.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ydb.Sdk/src/Ado/YdbCommand.cs b/src/Ydb.Sdk/src/Ado/YdbCommand.cs index 5feecda3..cec8d5db 100644 --- a/src/Ydb.Sdk/src/Ado/YdbCommand.cs +++ b/src/Ydb.Sdk/src/Ado/YdbCommand.cs @@ -31,7 +31,7 @@ public override async Task ExecuteNonQueryAsync(CancellationToken cancellat { await using var dataReader = await ExecuteReaderAsync(cancellationToken); - while (await dataReader.ReadAsync(cancellationToken)) + while (await dataReader.NextResultAsync(cancellationToken)) { } @@ -51,7 +51,7 @@ public override async Task ExecuteNonQueryAsync(CancellationToken cancellat ? dataReader.IsDBNull(0) ? null : dataReader.GetValue(0) : null; - while (await dataReader.ReadAsync(cancellationToken)) + while (await dataReader.NextResultAsync(cancellationToken)) { }