Skip to content

Commit 486ccd9

Browse files
committed
improve tryQueryOffset
Signed-off-by: Gabriele Santomaggio <[email protected]>
1 parent 5751bde commit 486ccd9

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

RabbitMQ.Stream.Client/StreamSystem.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,13 +494,12 @@ public async Task<ulong> QueryOffset(string reference, string stream)
494494
/// Note: TryQueryOffset could return null even if the offset exists but for any other exception.
495495
/// For a more precise exception handling, use QueryOffset.
496496
/// </summary>
497-
498497
public async Task<ulong?> TryQueryOffset(string reference, string stream)
499498
{
500499
try
501500
{
502-
var qOffset = await QueryOffset(reference, stream).ConfigureAwait(false);
503-
return qOffset;
501+
var response = await _client.QueryOffset(reference, stream).ConfigureAwait(false);
502+
return response.Offset;
504503
}
505504
catch (Exception)
506505
{

Tests/RawConsumerSystemTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ await Assert.ThrowsAsync<OffsetNotFoundException>(() =>
527527
system.QueryOffset("reference_does_not_exist", stream));
528528

529529
Assert.Null(await system.TryQueryOffset("reference_does_not_exist", stream));
530+
Assert.Null(await system.TryQueryOffset(Reference, "stream_does_not_exist"));
530531

531532
await rawConsumer.Close();
532533
await system.DeleteStream(stream);
@@ -584,8 +585,10 @@ public async Task ShouldConsumeFromStoredOffset()
584585

585586
// new consumer that should start from stored offset
586587
var offset = await system.QueryOffset(Reference, stream);
588+
var tryOffset = await system.TryQueryOffset(Reference, stream);
587589
// the offset received must be the same from the last stored
588590
Assert.Equal(offset, await storedOffset.Task);
591+
Assert.Equal(offset, tryOffset);
589592
var messagesConsumed = new TaskCompletionSource<ulong>();
590593
var rawConsumerWithOffset = await system.CreateRawConsumer(
591594
new RawConsumerConfig(stream)

0 commit comments

Comments
 (0)