Skip to content

test(query-db-collection): characterize cancellation and subset cleanup#1673

Merged
KyleAMathews merged 4 commits into
mainfrom
test-query-cancellation-subset-cleanup
Jul 16, 2026
Merged

test(query-db-collection): characterize cancellation and subset cleanup#1673
KyleAMathews merged 4 commits into
mainfrom
test-query-cancellation-subset-cleanup

Conversation

@KyleAMathews

@KyleAMathews KyleAMathews commented Jul 13, 2026

Copy link
Copy Markdown
Collaborator

Summary

Characterizes query cancellation and subset cleanup across aborts, late results, cache removal, rapid remounts, and invalidation cycles. It also fixes temporary readiness listeners so in-flight subset unload and collection cleanup do not retain stale Query Core observers.

Root cause

The temporary QueryObserver.subscribe listeners used to settle subset readiness promises were not tracked separately. During an in-flight unload, those listeners kept observer.hasListeners() true, preventing idle subset cleanup and leaving a stale observer behind.

Approach

  • Track temporary readiness-listener unsubscribe callbacks by hashed query key.
  • Release them on success, error, subset unload, and full collection cleanup.
  • Centralize the readiness lifecycle in a private waitForQueryReady helper.
  • Add deferred-promise characterization tests for signal cancellation, late fulfillment, cache removal notifications, rapid remount, stale row/observer cleanup, and invalidate/unsubscribe/resubscribe behavior.

Key invariants

  • Cleaning up an in-flight subset leaves no stale readiness observer or materialized rows.
  • A late result after unload cannot rematerialize rows.
  • A rapid remount of the same subset deterministically reuses and materializes the in-flight result.
  • Existing Query Core cancellation, cache, and QueryClient mounting semantics remain unchanged.

Non-goals

  • No query-lease state machine.
  • No public API changes.
  • No changes to QueryClient mounting semantics.
  • No attempt to redefine Query Core cache retention behavior.

Trade-offs

This uses private listener bookkeeping rather than introducing a broader ownership abstraction. It is intentionally narrow and regression-tested; a larger lifecycle state machine can be considered separately.

Verification

pnpm --filter @tanstack/query-db-collection exec vitest run tests/query.test.ts -t "query cancellation and subset cleanup lifecycle" --pool-options.threads.maxThreads=2
pnpm --filter @tanstack/query-db-collection test --maxWorkers=2

The lifecycle subset passed five consecutive runs. The package suite passed 236 tests with no type errors.

Files changed

  • packages/query-db-collection/src/query.ts — track and release temporary readiness listeners and centralize their lifecycle.
  • packages/query-db-collection/tests/query.test.ts — add focused cancellation and cleanup characterization coverage.
  • .changeset/characterize-query-cleanup.md — record the patch-level cleanup fix.

Summary by CodeRabbit

  • Bug Fixes
    • Fixed cleanup of temporary query readiness listeners when subsets are unloaded or collections are cleaned up during in-flight requests.
    • Improved cancellation and observer cleanup when queries become idle or are eagerly removed.
    • Preserved active subset data and updates across cache removal, remounts, and late responses.
    • Ensured subsequent invalidations continue updating collections correctly after cleanup.

@coderabbitai

coderabbitai Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This change tracks temporary query-readiness subscriptions, reuses centralized readiness waiting, cleans pending listeners during query cleanup, and adds lifecycle tests covering cancellation, subset unloading, remounting, invalidation, and observer release.

Changes

Query readiness cleanup

Layer / File(s) Summary
Readiness listener management
packages/query-db-collection/src/query.ts
Adds tracked readiness subscriptions and uses a shared helper for existing and newly created observers.
Query cleanup integration
packages/query-db-collection/src/query.ts, .changeset/characterize-query-cleanup.md
Unsubscribes pending readiness listeners during internal and idle cleanup and records the patch release.
Lifecycle regression coverage
packages/query-db-collection/tests/query.test.ts
Adds deferred control and tests for cancellation, subset cleanup, remounting, invalidation, and observer release.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Suggested reviewers: kevin-dp, samwillis, spokodev, delphinaubin, claude[bot]

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly matches the PR’s main change: characterizing query cancellation and subset cleanup in query-db-collection.
Description check ✅ Passed The description covers the change, motivation, verification, and release impact, but it does not follow the template headings exactly.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch test-query-cancellation-subset-cleanup

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

ESLint install failed. For unrecoverable errors, disable the tool in CodeRabbit configuration.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@pkg-pr-new

pkg-pr-new Bot commented Jul 13, 2026

Copy link
Copy Markdown
More templates

@tanstack/angular-db

npm i https://pkg.pr.new/@tanstack/angular-db@1673

@tanstack/browser-db-sqlite-persistence

npm i https://pkg.pr.new/@tanstack/browser-db-sqlite-persistence@1673

@tanstack/capacitor-db-sqlite-persistence

npm i https://pkg.pr.new/@tanstack/capacitor-db-sqlite-persistence@1673

@tanstack/cloudflare-durable-objects-db-sqlite-persistence

npm i https://pkg.pr.new/@tanstack/cloudflare-durable-objects-db-sqlite-persistence@1673

@tanstack/db

npm i https://pkg.pr.new/@tanstack/db@1673

@tanstack/db-ivm

npm i https://pkg.pr.new/@tanstack/db-ivm@1673

@tanstack/db-sqlite-persistence-core

npm i https://pkg.pr.new/@tanstack/db-sqlite-persistence-core@1673

@tanstack/electric-db-collection

npm i https://pkg.pr.new/@tanstack/electric-db-collection@1673

@tanstack/electron-db-sqlite-persistence

npm i https://pkg.pr.new/@tanstack/electron-db-sqlite-persistence@1673

@tanstack/expo-db-sqlite-persistence

npm i https://pkg.pr.new/@tanstack/expo-db-sqlite-persistence@1673

@tanstack/node-db-sqlite-persistence

npm i https://pkg.pr.new/@tanstack/node-db-sqlite-persistence@1673

@tanstack/offline-transactions

npm i https://pkg.pr.new/@tanstack/offline-transactions@1673

@tanstack/powersync-db-collection

npm i https://pkg.pr.new/@tanstack/powersync-db-collection@1673

@tanstack/query-db-collection

npm i https://pkg.pr.new/@tanstack/query-db-collection@1673

@tanstack/react-db

npm i https://pkg.pr.new/@tanstack/react-db@1673

@tanstack/react-native-db-sqlite-persistence

npm i https://pkg.pr.new/@tanstack/react-native-db-sqlite-persistence@1673

@tanstack/rxdb-db-collection

npm i https://pkg.pr.new/@tanstack/rxdb-db-collection@1673

@tanstack/solid-db

npm i https://pkg.pr.new/@tanstack/solid-db@1673

@tanstack/svelte-db

npm i https://pkg.pr.new/@tanstack/svelte-db@1673

@tanstack/tauri-db-sqlite-persistence

npm i https://pkg.pr.new/@tanstack/tauri-db-sqlite-persistence@1673

@tanstack/trailbase-db-collection

npm i https://pkg.pr.new/@tanstack/trailbase-db-collection@1673

@tanstack/vue-db

npm i https://pkg.pr.new/@tanstack/vue-db@1673

commit: 9b08e3c

@github-actions

Copy link
Copy Markdown
Contributor

Size Change: 0 B

Total Size: 125 kB

ℹ️ View Unchanged
Filename Size
packages/db/dist/esm/collection/change-events.js 1.43 kB
packages/db/dist/esm/collection/changes.js 1.38 kB
packages/db/dist/esm/collection/cleanup-queue.js 810 B
packages/db/dist/esm/collection/events.js 434 B
packages/db/dist/esm/collection/index.js 3.62 kB
packages/db/dist/esm/collection/indexes.js 1.99 kB
packages/db/dist/esm/collection/lifecycle.js 1.69 kB
packages/db/dist/esm/collection/mutations.js 2.47 kB
packages/db/dist/esm/collection/state.js 5.48 kB
packages/db/dist/esm/collection/subscription.js 3.74 kB
packages/db/dist/esm/collection/sync.js 2.88 kB
packages/db/dist/esm/collection/transaction-metadata.js 144 B
packages/db/dist/esm/deferred.js 207 B
packages/db/dist/esm/errors.js 5.1 kB
packages/db/dist/esm/event-emitter.js 748 B
packages/db/dist/esm/index.js 3.16 kB
packages/db/dist/esm/indexes/auto-index.js 829 B
packages/db/dist/esm/indexes/base-index.js 767 B
packages/db/dist/esm/indexes/basic-index.js 2.06 kB
packages/db/dist/esm/indexes/btree-index.js 2.19 kB
packages/db/dist/esm/indexes/index-registry.js 820 B
packages/db/dist/esm/indexes/reverse-index.js 557 B
packages/db/dist/esm/live-query-adapter.js 318 B
packages/db/dist/esm/local-only.js 916 B
packages/db/dist/esm/local-storage.js 2.12 kB
packages/db/dist/esm/optimistic-action.js 359 B
packages/db/dist/esm/paced-mutations.js 496 B
packages/db/dist/esm/proxy.js 3.75 kB
packages/db/dist/esm/query/builder/functions.js 1.47 kB
packages/db/dist/esm/query/builder/index.js 5.84 kB
packages/db/dist/esm/query/builder/ref-proxy.js 1.24 kB
packages/db/dist/esm/query/compiler/evaluators.js 1.89 kB
packages/db/dist/esm/query/compiler/expressions.js 430 B
packages/db/dist/esm/query/compiler/group-by.js 3.56 kB
packages/db/dist/esm/query/compiler/index.js 6.67 kB
packages/db/dist/esm/query/compiler/joins.js 2.5 kB
packages/db/dist/esm/query/compiler/lazy-targets.js 923 B
packages/db/dist/esm/query/compiler/order-by.js 1.74 kB
packages/db/dist/esm/query/compiler/select.js 1.53 kB
packages/db/dist/esm/query/effect.js 4.77 kB
packages/db/dist/esm/query/expression-helpers.js 1.43 kB
packages/db/dist/esm/query/ir.js 1.25 kB
packages/db/dist/esm/query/live-query-collection.js 360 B
packages/db/dist/esm/query/live/collection-config-builder.js 9.1 kB
packages/db/dist/esm/query/live/collection-registry.js 264 B
packages/db/dist/esm/query/live/collection-subscriber.js 1.93 kB
packages/db/dist/esm/query/live/internal.js 145 B
packages/db/dist/esm/query/live/utils.js 1.81 kB
packages/db/dist/esm/query/optimizer.js 2.92 kB
packages/db/dist/esm/query/predicate-utils.js 2.97 kB
packages/db/dist/esm/query/query-once.js 359 B
packages/db/dist/esm/query/subset-dedupe.js 960 B
packages/db/dist/esm/scheduler.js 1.3 kB
packages/db/dist/esm/SortedMap.js 1.3 kB
packages/db/dist/esm/strategies/debounceStrategy.js 247 B
packages/db/dist/esm/strategies/queueStrategy.js 428 B
packages/db/dist/esm/strategies/throttleStrategy.js 246 B
packages/db/dist/esm/transactions.js 3.04 kB
packages/db/dist/esm/utils.js 927 B
packages/db/dist/esm/utils/array-utils.js 273 B
packages/db/dist/esm/utils/browser-polyfills.js 304 B
packages/db/dist/esm/utils/btree.js 5.61 kB
packages/db/dist/esm/utils/comparison.js 1.11 kB
packages/db/dist/esm/utils/cursor.js 457 B
packages/db/dist/esm/utils/index-optimization.js 2.39 kB
packages/db/dist/esm/utils/type-guards.js 157 B
packages/db/dist/esm/utils/uuid.js 449 B
packages/db/dist/esm/virtual-props.js 360 B

compressed-size-action::db-package-size

@github-actions

Copy link
Copy Markdown
Contributor

Size Change: 0 B

Total Size: 4.22 kB

ℹ️ View Unchanged
Filename Size
packages/react-db/dist/esm/index.js 249 B
packages/react-db/dist/esm/useLiveInfiniteQuery.js 1.32 kB
packages/react-db/dist/esm/useLiveQuery.js 1.33 kB
packages/react-db/dist/esm/useLiveQueryEffect.js 355 B
packages/react-db/dist/esm/useLiveSuspenseQuery.js 567 B
packages/react-db/dist/esm/usePacedMutations.js 401 B

compressed-size-action::react-db-package-size

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick comments (1)
packages/query-db-collection/tests/query.test.ts (1)

2430-2467: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Cover the readiness-error cleanup path.

This suite only settles deferred queries with resolve, while waitForQueryReady has separate error cleanup logic. Add a rejected-preload case that verifies rejection and observer release, unless equivalent coverage already exists.

As per coding guidelines, “Always add unit tests that reproduce a bug before fixing it” and test async race conditions.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/query-db-collection/tests/query.test.ts` around lines 2430 - 2467,
Add a rejected-preload test alongside the existing late-result test, using a
deferred query that rejects after liveQuery.cleanup(). Verify preload rejects,
the query observer count is released while the request is pending and after
rejection, and retain cleanup assertions for the collection. Exercise the
waitForQueryReady error-cleanup path rather than only the successful resolution
path.

Source: Coding guidelines

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@packages/query-db-collection/tests/query.test.ts`:
- Around line 2430-2467: Add a rejected-preload test alongside the existing
late-result test, using a deferred query that rejects after liveQuery.cleanup().
Verify preload rejects, the query observer count is released while the request
is pending and after rejection, and retain cleanup assertions for the
collection. Exercise the waitForQueryReady error-cleanup path rather than only
the successful resolution path.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 196919b7-0cf0-4153-9d50-081591630eb5

📥 Commits

Reviewing files that changed from the base of the PR and between 09d7d67 and 9b08e3c.

📒 Files selected for processing (3)
  • .changeset/characterize-query-cleanup.md
  • packages/query-db-collection/src/query.ts
  • packages/query-db-collection/tests/query.test.ts

@KyleAMathews
KyleAMathews merged commit 73e5b67 into main Jul 16, 2026
11 checks passed
@KyleAMathews
KyleAMathews deleted the test-query-cancellation-subset-cleanup branch July 16, 2026 20:03
@github-actions github-actions Bot mentioned this pull request Jul 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants