Skip to content

Commit 580409e

Browse files
* IReadOnlyCollection -> IReadOnlyList
* Update Grpc lib version * Fixed error type: YdbException -> ReaderException * Added new units tests
1 parent 6b52027 commit 580409e

File tree

5 files changed

+1179
-72
lines changed

5 files changed

+1179
-72
lines changed

src/Ydb.Sdk/src/Services/Topic/Reader/Message.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ public class BatchMessages<TValue>
5959
private readonly OffsetsRange _offsetsRange;
6060
private readonly long _partitionSessionId;
6161

62-
public IReadOnlyCollection<Message<TValue>> Batch { get; }
62+
public IReadOnlyList<Message<TValue>> Batch { get; }
6363

6464
internal BatchMessages(
65-
IReadOnlyCollection<Message<TValue>> batch,
65+
IReadOnlyList<Message<TValue>> batch,
6666
ReaderSession<TValue> readerSession,
6767
OffsetsRange offsetsRange,
6868
long partitionSessionId)

src/Ydb.Sdk/src/Services/Topic/Reader/PartitionSession.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public PartitionSession(
3737
internal long PrevEndOffsetMessage { get; set; }
3838

3939
// Each offset up to and including (committed_offset - 1) was fully processed.
40-
internal long CommitedOffset { get; private set; }
40+
private long CommitedOffset { get; set; }
4141

4242
internal void RegisterCommitRequest(CommitSending commitSending)
4343
{

src/Ydb.Sdk/src/Services/Topic/Reader/Reader.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Threading.Channels;
33
using Google.Protobuf.WellKnownTypes;
44
using Microsoft.Extensions.Logging;
5-
using Ydb.Sdk.Ado;
65
using Ydb.Topic;
76
using Ydb.Topic.V1;
87
using static Ydb.Topic.StreamReadMessage.Types.FromServer;
@@ -203,9 +202,9 @@ public void Dispose()
203202
{
204203
try
205204
{
205+
_receivedMessagesChannel.Writer.TryComplete();
206+
206207
_disposeCts.Cancel();
207-
208-
_receivedMessagesChannel.Writer.Complete();
209208
}
210209
finally
211210
{
@@ -442,7 +441,7 @@ public async Task CommitOffsetRange(OffsetsRange offsetsRange, long partitionSes
442441
var tcsCommit = new TaskCompletionSource();
443442

444443
await using var register = _lifecycleReaderSessionCts.Token.Register(
445-
() => tcsCommit.TrySetException(new YdbException($"ReaderSession[{SessionId}] was deactivated"))
444+
() => tcsCommit.TrySetException(new ReaderException($"ReaderSession[{SessionId}] was deactivated"))
446445
);
447446

448447
var commitSending = new CommitSending(offsetsRange, tcsCommit);

src/Ydb.Sdk/src/Ydb.Sdk.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Ydb.Protos" Version="1.0.6" />
29+
<PackageReference Include="Ydb.Protos" Version="1.1.0" />
3030
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
3131
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" />
3232
</ItemGroup>

0 commit comments

Comments
 (0)