Skip to content

QueryDeadLetterEnvelopesAsync() fix Limit #1673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremydmiller merged 1 commit into from
Sep 5, 2025
Merged

QueryDeadLetterEnvelopesAsync() fix Limit #1673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/Persistence/Wolverine.RDBMS/MessageDatabase.DeadLetters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ public async Task<DeadLetterEnvelopesFound> QueryDeadLetterEnvelopesAsync(DeadLe
query += $" and {DatabaseConstants.Id} >= @startId";
}

if (queryParameters.Limit > 0)
{
query += " limit @limit";
}

var command = CreateCommand(query);

if (!string.IsNullOrEmpty(queryParameters.ExceptionType))
Expand Down Expand Up @@ -72,15 +77,18 @@ public async Task<DeadLetterEnvelopesFound> QueryDeadLetterEnvelopesAsync(DeadLe
command = command.With("startId", queryParameters.StartId.Value);
}

command.With("limit", queryParameters.Limit);
if (queryParameters.Limit > 0)
{
command = command.With("limit", queryParameters.Limit + 1);
}

var deadLetterEnvelopes = (List<DeadLetterEnvelope>)await command.FetchListAsync(reader =>
DatabasePersistence.ReadDeadLetterAsync(reader, _cancellation), cancellation: _cancellation);

if (deadLetterEnvelopes.Count > queryParameters.Limit)
if (queryParameters.Limit > 0 && deadLetterEnvelopes.Count > queryParameters.Limit)
{
deadLetterEnvelopes.RemoveAt(deadLetterEnvelopes.Count - 1);
var nextId = deadLetterEnvelopes.LastOrDefault()?.Envelope.Id;
deadLetterEnvelopes.RemoveAt(deadLetterEnvelopes.Count - 1);
return new(deadLetterEnvelopes, nextId, tenantId);
}

Expand Down
Loading