Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a panic in the CheckProposedVersion function when handling legacy revision cases where there's no local HLV (Hybrid Logical Vector) but the parent revision doesn't match the local current revision.
Key changes:
- Added a condition to return conflict status with current revision when no HLV exists but revisions don't match
- Updated test client conflict detection logic to handle revision tree IDs and missing HLV cases
- Added a comprehensive test case to reproduce the panic scenario
Reviewed Changes
Copilot reviewed 3 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| db/crud.go | Added null HLV check in CheckProposedVersion to prevent panic and return proper conflict status |
| rest/utilities_testing_blip_client.go | Updated conflict detection method to accept revOptions and handle revision tree ID cases |
| rest/blip_api_crud_test.go | Added test case reproducing the panic scenario in legacy revision handling |
adamcfraser
approved these changes
Oct 7, 2025
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.
CBG-4907
CheckProposedVersionand run the test.Pre-review checklist
fmt.Print,log.Print, ...)base.UD(docID),base.MD(dbName))docs/apiDependencies (if applicable)
Integration Tests
GSI=true,xattrs=truehttps://jenkins.sgwdev.com/job/SyncGatewayIntegration/0000/