fix(pds): accept create+delete on the same rkey in applyWrites#176
Merged
Conversation
Drop the pre-flight intra-batch rkey-collision check so create+delete on the same rkey atomically resolves to a no-op, matching the reference PDS. Two creates for the same rkey now surface as 409 RecordAlreadyExists from the repo layer instead of a 400.
Deploying with
|
| Status | Name | Latest Commit | Updated (UTC) |
|---|---|---|---|
| ✅ Deployment successful! View logs |
pdscheck | 2ec96b7 | May 24 2026, 07:52 PM |
Deploying with
|
| Status | Name | Latest Commit | Preview URL | Updated (UTC) |
|---|---|---|---|---|
| ✅ Deployment successful! View logs |
cirrusdocs | 2ec96b7 | Commit Preview URL Branch Preview URL |
May 24 2026, 07:52 PM |
Deploying with
|
| Status | Name | Latest Commit | Updated (UTC) |
|---|---|---|---|
| ✅ Deployment successful! View logs |
atproto-pds | 2ec96b7 | May 24 2026, 07:52 PM |
commit: |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
com.atproto.repo.applyWriteswas rejecting any batch that referenced the same${collection}/${rkey}twice with400 InvalidRequest: duplicate rkey in batch. That broke a legitimate atomic create+delete pattern used by real-world clients (and exercised by pdscheck's atomic create+delete test) which the reference PDS accepts.seenRkeyscollision check inpackages/pds/src/xrpc/repo.ts. The downstream apply order inaccount-do.tsalready produces the correct outcome: a create followed by a delete on the same key nets to no record, and two creates collide naturally inside the DO and surface as409 RecordAlreadyExists(the spec-correct status for an existing-key collision).Test plan
pnpm --filter @getcirrus/pds test(293 unit + 84 CLI tests passing)pnpm --filter @getcirrus/pds check