You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This carries #713 by @Wallace99 onto current main, keeping both of their commits and authorship. 0.6 already has the same fix as #715, released in 0.6.17 through the correlated_claim_tombstones schema patch.
A claim marks each candidate row with an EXISTS over ready_tombstones. For a small batch PostgreSQL can plan that check as a hashed subplan that reads the slot's whole tombstone partition on every claim, although the lookup index exists. OFFSET 0 in the subquery keeps it correlated: one index probe per candidate row. The installer (v023) writes the fenced check into new substrates.
The migration rewrites the claim functions already installed, from their own definitions, so signatures, owners, privileges and settings are unchanged and a function that already has the fence is left alone. On main that means claim_ready_runtime and every per-slot claim_ready_slot_<n> from v051 in the default and every trusted custom queue-storage schema found by awa.queue_storage_schemas(); 0.6 has no per-slot functions and its own discovery. Each function is found by its exact signature, and slot functions only for the schema's installed queue slots, so another function that shares one of those names is not touched. Each schema's rewrite takes the schema's install advisory lock, as v056 and the 0.6 patch do. It takes no table locks and binaries before it claim unchanged.
Renumbering: main gained its own v056 to v059 since #713 was opened, so its migration becomes v060_correlated_claim_tombstones.sql (header, schema_version row, MIGRATIONS entry, CURRENT_VERSION = 60, and the test's migration_sql_range(59, 60)). The merge from main does the renumbering; the commits after it add the install lock, the signature filter, the header contract, the v060 upgrade guide section and a fuller CHANGELOG entry.
Evidence, PostgreSQL 18.6: with the rewrite disabled, claim_tombstone_plan_test fails because a 32-row claim scans 10,000 tombstone rows (claim_legacy: force_custom_plan must not scan tombstone partitions, left 10000, right 0). With it, the test passes for legacy and receipt modes under custom and generic plans, replay leaves the bodies unchanged, and three planted same-named functions (two overloads and a slot beyond the installed count) stay untouched.
Also passing locally: cargo fmt, workspace clippy with -D warnings, workspace build, the 16 migration unit tests, test_every_migration_is_individually_re_runnable, schema_discovery_owner_test, and 33 tombstone and claim prune tests in queue_storage_runtime_test.
Summary by CodeRabbit
Bug Fixes
Improved claim performance for queues with tombstones by avoiding unnecessary reads across tombstone partitions.
The migration updates existing queue schemas without reinstalling tables or triggers. Binaries from before this update continue to claim work as before.
Take each schema's install advisory lock before rewriting its claim
functions, as v056 and the 0.6 schema patch do, and visit functions in a
stable order. The header now states the N-1 contract, live-load cost and
what external runners apply. Add the upgrade guide section and expand
the changelog entry.
No actionable comments were generated in the recent review.
Walkthrough
The claim queries now keep tombstone checks correlated. Migration v060 updates installed runtime and slot-specific claim functions in discovered queue-storage schemas. The migration registry, integration test, changelog, and upgrade guide are updated.
Changes: Claim tombstone checks
Layer / File(s)
Summary
Correlated checks in claim query definitions awa-model/migrations/v023_install_queue_storage_substrate.sql
The dynamic and generated per-slot claim queries add OFFSET 0 to tombstone checks.
Migration v060 discovers applicable schemas and updates installed claim functions that lack OFFSET 0. The migration registry advances to version 60.
Verify and document migration behavior awa-model/tests/claim_tombstone_plan_test.rs, docs/upgrade-0.6-to-0.7.md, CHANGELOG.md
The integration test checks function updates, migration replay, and claim plans. The upgrade guide and changelog describe v060 and its compatibility details.
hardbyte/awa#713: It applies the same correlated tombstone-check fix, with an earlier migration version and a regression test for plan behavior.
Merge Risk: Minimal · up to 47967
This change keeps the claim tombstone check correlated, so a small claim batch uses an index probe per candidate row instead of scanning a tombstone partition. The migration rewrites only installed claim functions that lack the fence and is safe to replay. Binaries that predate it keep claiming unchanged. No concrete merge-blocking risk was identified.
Pre-merge checks: 4
Check name
Status
Explanation
Title check
The title "fix(storage): keep claim tombstone checks correlated (v060)" matches the main change. The PR adds OFFSET 0 to the tombstone EXISTS checks so PostgreSQL uses an index probe per candidate row…
Linked Issues check
Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check
Check skipped because no linked issues were found for this pull request.
Description Check
Check skipped - CodeRabbit’s high-level summary is enabled.
Full details: Title check
Explanation
The title "fix(storage): keep claim tombstone checks correlated (v060)" matches the main change. The PR adds OFFSET 0 to the tombstone EXISTS checks so PostgreSQL uses an index probe per candidate row, and migration v060 rewrites the existing claim functions to apply that fix. The title names the fix, the affected area (storage), and the migration version. It is specific and concise, and it is a single sentence without noise.
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
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.
A rabbit checks the queue at dawn, With OFFSET set, the scan moves on. Each claim probes where tombstones lie, The live rows hop neatly by. V060 keeps the functions in line, And leaves old binaries doing fine.
Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.
Find claim_ready_runtime and each claim_ready_slot_<n> for the installed
queue slots by their exact signatures, so another function that shares
one of those names is left alone. The plan test plants such functions
and checks that the migration does not change them.
Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
full-ciRun the full CI matrix (Python build+test, E2E) on this PR
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
hardbyte
added
the
full-ci
Claude
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
This carries #713 by @Wallace99 onto current
main, keeping both of their commits and authorship. 0.6 already has the same fix as #715, released in 0.6.17 through thecorrelated_claim_tombstonesschema patch.A claim marks each candidate row with an
EXISTSoverready_tombstones. For a small batch PostgreSQL can plan that check as a hashed subplan that reads the slot's whole tombstone partition on every claim, although the lookup index exists.OFFSET 0in the subquery keeps it correlated: one index probe per candidate row. The installer (v023) writes the fenced check into new substrates.The migration rewrites the claim functions already installed, from their own definitions, so signatures, owners, privileges and settings are unchanged and a function that already has the fence is left alone. On
mainthat meansclaim_ready_runtimeand every per-slotclaim_ready_slot_<n>from v051 in the default and every trusted custom queue-storage schema found byawa.queue_storage_schemas(); 0.6 has no per-slot functions and its own discovery. Each function is found by its exact signature, and slot functions only for the schema's installed queue slots, so another function that shares one of those names is not touched. Each schema's rewrite takes the schema's install advisory lock, as v056 and the 0.6 patch do. It takes no table locks and binaries before it claim unchanged.Renumbering:
maingained its own v056 to v059 since #713 was opened, so its migration becomesv060_correlated_claim_tombstones.sql(header,schema_versionrow,MIGRATIONSentry,CURRENT_VERSION = 60, and the test'smigration_sql_range(59, 60)). The merge frommaindoes the renumbering; the commits after it add the install lock, the signature filter, the header contract, the v060 upgrade guide section and a fuller CHANGELOG entry.Evidence, PostgreSQL 18.6: with the rewrite disabled,
claim_tombstone_plan_testfails because a 32-row claim scans 10,000 tombstone rows (claim_legacy: force_custom_plan must not scan tombstone partitions, left 10000, right 0). With it, the test passes for legacy and receipt modes under custom and generic plans, replay leaves the bodies unchanged, and three planted same-named functions (two overloads and a slot beyond the installed count) stay untouched.Also passing locally:
cargo fmt, workspace clippy with-D warnings, workspace build, the 16 migration unit tests,test_every_migration_is_individually_re_runnable,schema_discovery_owner_test, and 33 tombstone and claim prune tests inqueue_storage_runtime_test.Summary by CodeRabbit