Merge pull request #173 from nblumhardt/batched-count-fix

Respect --count parameter when returning paged result sets through seqcli search
datalust · Feb 12, 2021 · 2ff1669 · 2ff1669
2 parents 796a127 + 90e6939
commit 2ff1669
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/SeqCli/Cli/Commands/SearchCommand.cs b/src/SeqCli/Cli/Commands/SearchCommand.cs
@@ -73,29 +73,32 @@ protected override async Task<int> Run()
                     if (!string.IsNullOrWhiteSpace(_filter))
                         filter = (await connection.Expressions.ToStrictAsync(_filter)).StrictExpression;
 
-                    string lastReadEventId = null;
+                    string nextPageAfterId = null;
                     var remaining = _count;
                     while (remaining > 0)
                     {
-                        var resultSet = await connection.Events.InSignalAsync(
+                        var page = await connection.Events.InSignalAsync(
                             null,
                             _signal.Signal,
                             filter: filter,
                             count: remaining,
                             fromDateUtc: _range.Start,
                             toDateUtc: _range.End,
-                            afterId: lastReadEventId);
+                            afterId: nextPageAfterId);
 
-                        foreach (var evt in resultSet.Events)
+                        nextPageAfterId = page.Statistics.LastReadEventId;
+
+                        foreach (var evt in page.Events)
                         {
-                            remaining++;
                             output.Write(ToSerilogEvent(evt));
+                            remaining--;
+
+                            if (remaining == 0)
+                                break;
                         }
 
-                        if (resultSet.Statistics.Status != ResultSetStatus.Partial)
+                        if (page.Statistics.Status != ResultSetStatus.Partial)
                             break;
-
-                        lastReadEventId = resultSet.Statistics.LastReadEventId;
                     }
                 }