fix: skip exhausted search pages

Author: adityareddy-dev

.changeset/skip-exhausted-search-pages.md

@@ -0,0 +1,6 @@
+---
+'@hyperdx/app': patch
+---
+
+Skip redundant offset queries after a search returns fewer rows than the
+requested page size.

packages/app/src/hooks/__tests__/useOffsetPaginatedQuery.test.tsx

@@ -388,12 +388,84 @@ describe('useOffsetPaginatedQuery', () => {
       expect(result.current.data).toBeDefined();
       expect(result.current.data?.window.windowIndex).toBe(0);
 
-      // Should have more pages available due to large time range
-      expect(result.current.hasNextPage).toBe(true);
+      // The only window has fewer rows than the requested limit.
+      expect(result.current.hasNextPage).toBe(false);
     });
   });
 
   describe('Pagination Within Time Windows', () => {
+    it.each(['Timestamp DESC', 'Timestamp ASC'])(
+      'moves straight to the next window after a partial page (%s)',
+      async orderBy => {
+        const config = createMockChartConfig({
+          orderBy,
+          limit: { limit: 100, offset: 0 },
+        });
+        mockReader.read
+          .mockResolvedValueOnce({
+            done: false,
+            value: [
+              { json: () => ['message'] },
+              { json: () => ['String'] },
+              { json: () => ['first window'] },
+            ],
+          })
+          .mockResolvedValueOnce({ done: true });
+
+        const { result } = renderHook(() => useOffsetPaginatedQuery(config), {
+          wrapper,
+        });
+        await waitFor(() => expect(result.current.isLoading).toBe(false));
+        expect(result.current.data?.data).toHaveLength(1);
+        expect(result.current.hasNextPage).toBe(true);
+
+        mockReader.read.mockResolvedValueOnce({ done: true });
+        await act(async () => {
+          await result.current.fetchNextPage();
+        });
+
+        await waitFor(() => {
+          expect(result.current.data?.window.windowIndex).toBe(1);
+        });
+        expect(jest.mocked(renderChartConfig).mock.calls[1][0]).toMatchObject({
+          limit: { limit: 100, offset: 0 },
+        });
+      },
+    );
+
+    it.each([
+      ['a search without windowing', { orderBy: 'message DESC' }],
+      ['a query without LIMIT', { orderBy: 'message DESC', limit: undefined }],
+      [
+        'the final time window',
+        {
+          dateRange: [
+            new Date('2024-01-01T00:00:00Z'),
+            new Date('2024-01-01T00:05:00Z'),
+          ] as [Date, Date],
+        },
+      ],
+    ])('stops after a partial page for %s', async (_name, overrides) => {
+      const config = createMockChartConfig(overrides);
+      mockReader.read
+        .mockResolvedValueOnce({
+          done: false,
+          value: [
+            { json: () => ['message'] },
+            { json: () => ['String'] },
+            { json: () => ['only result'] },
+          ],
+        })
+        .mockResolvedValueOnce({ done: true });
+
+      const { result } = renderHook(() => useOffsetPaginatedQuery(config), {
+        wrapper,
+      });
+      await waitFor(() => expect(result.current.isLoading).toBe(false));
+      expect(result.current.data?.data).toHaveLength(1);
+      expect(result.current.hasNextPage).toBe(false);
+    });
+
     it('should paginate within the same time window', async () => {
       const config = createMockChartConfig({
         limit: { limit: 2, offset: 0 },

packages/app/src/hooks/useOffsetPaginatedQuery.tsx

@@ -159,8 +159,13 @@ function getNextPageParam(
     0,
   );
 
-  // If we have results in the current window, continue paginating within it
-  if (lastPage.data.length > 0) {
+  // A short page, or a query without LIMIT, has exhausted this window.
+  const requestedLimit = config.limit?.limit;
+  if (
+    lastPage.data.length > 0 &&
+    requestedLimit != null &&
+    lastPage.data.length >= requestedLimit
+  ) {
     return {
       windowIndex: currentWindow.windowIndex,
       offset: currentWindowResults,