Conversation
CleanOrphanUploadFiles scans available file records with OFFSET/LIMIT pagination while marking the processed orphans as Deleted, which removes them from the available result set. The records that follow shift forward, so the offset of the next page skips records that were never checked in the same cleanup run. Scan the available records by id cursor instead: query the records with status = Available and id greater than the last scanned id, ordered by id ascending, and advance the cursor per record. Records marked as deleted during the scan no longer affect the position of the remaining records, so every eligible record is checked in a single run. Close apache#1631
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
No unresolved review issues were identified.
Review effort: Lite
Findings: None
What changed in this PR
Fixes orphan-upload cleanup skipping records when deleted records shift offset-based pages.
Changes:
- Replaces offset pagination with ID-cursor pagination.
- Advances the cursor for each processed record.
- Adds regression coverage across 2,500 records.
| File | Description |
|---|---|
internal/service/file_record/file_record_service.go |
Uses cursor-based cleanup scanning. |
internal/service/file_record/file_record_service_test.go |
Adds multi-page regression coverage. |
internal/repo/file_record/file_record_repo.go |
Implements ordered ID-cursor querying. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
This branch has not been deployed
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
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.
Fixes #1631
Proposed Changes
OFFSET/LIMITpagination of available file records with an id cursor query:status = Available AND id > lastID ORDER BY id ASC LIMIT n(GetFileRecordListAfterID).lastIDcursor per record inCleanOrphanUploadFiles, so records marked asDeletedduring the scan no longer shift the remaining records forward and make the next page skip records that were never checked.The removed
GetFileRecordPagewas only used by this cleanup loop.