CBL-8390: Implement Parse and Compare Non-numeric checkpoint resolution#2496
Closed
jianminzhao wants to merge 2 commits into
Closed
CBL-8390: Implement Parse and Compare Non-numeric checkpoint resolution#2496jianminzhao wants to merge 2 commits into
jianminzhao wants to merge 2 commits into
Conversation
|
This is a release branch and commits are restricted. Please confirm this PR is one of the following:
|
Contributor
Author
|
Auto merged from master branch |
|
Code Coverage Results:
|
Contributor
Author
|
The ticket is assigned to release/3.4 |
There was a problem hiding this comment.
Pull request overview
This PR introduces support for parsing and ordering Sync Gateway compound (non-numeric) remote sequence IDs so checkpoint mismatch resolution can roll back/ignore correctly instead of resetting replication when sequences aren’t plain integers.
Changes:
- Add
ParsedSequenceIDtype withparse()andbefore()ordering rules aligned with Sync Gateway’s checkpoint comparison semantics. - Teach checkpoint validation to compare parsed remote sequences (including compound formats) and only roll back when the server checkpoint is actually earlier.
- Add a comprehensive unit test suite for parsing/classification/comparison rules, and wire it into the CMake test target.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| Replicator/tests/ParsedSequenceIDTest.cc | New unit tests covering parsing/classification and cross-format ordering semantics. |
| Replicator/RemoteSequence.hh | Adds conversion helper to parse remote sequence values into ParsedSequenceID. |
| Replicator/ParsedSequenceID.hh | New header implementing parsing + ordering rules for compound sequence IDs. |
| Replicator/Checkpoint.cc | Updates checkpoint mismatch logic to compare parsed sequences instead of only numeric sequences. |
| LiteCore/tests/CMakeLists.txt | Adds the new test file to the LiteCore test executable. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+78
to
+86
| /** Convert this RemoteSequence to a ParsedSequenceID. Returns false if unparseable. */ | ||
| [[nodiscard]] bool toParsedSequenceID(ParsedSequenceID& out) const { | ||
| if ( !*this ) return false; | ||
| if ( isInt() ) { | ||
| out = {intValue(), 0, 0}; | ||
| return true; | ||
| } | ||
| return ParsedSequenceID::parse(std::string(sliceValue()), out); | ||
| } |
Comment on lines
+1
to
+3
| #include "ParsedSequenceID.hh" | ||
| #include "c4Test.hh" | ||
|
|
Comment on lines
+118
to
137
| ParsedSequenceID localParsed, remoteParsed; | ||
| bool localParseable = _remote.toParsedSequenceID(localParsed); | ||
| bool remoteParseable = remoteSequences._remote.toParsedSequenceID(remoteParsed); | ||
| if ( localParseable && remoteParseable ) { | ||
| if ( remoteParsed.before(localParsed) ) { | ||
| LogTo(SyncLog, "Rolling back to earlier remote sequence from server, some redundant changes may be " | ||
| "proposed..."); | ||
| _remote = remoteSequences._remote; | ||
| match = false; | ||
| } else { | ||
| LogTo(SyncLog, "Ignoring remote sequence on server since client side is older, some redundant " | ||
| "changes may be proposed..."); | ||
| LogTo(SyncLog, "Ignoring remote sequence on server since client side is older or equal, some " | ||
| "redundant changes may be proposed..."); | ||
| } | ||
| } else { | ||
| Warn("Non-numeric remote sequence detected, resetting replication back to start. Redundant changes " | ||
| "will be proposed..."); | ||
| Warn("Unparseable remote sequence: locally-saved remote seq '%s' is %s, " | ||
| "server-side remote seq '%s' is %s. Resetting replication.", | ||
| _remote.toJSONString().c_str(), localParseable ? "parseable" : "UNPARSEABLE", | ||
| remoteSequences._remote.toJSONString().c_str(), remoteParseable ? "parseable" : "UNPARSEABLE"); | ||
| _remote = {}; | ||
| match = false; |
Comment on lines
+1
to
+6
| #pragma once | ||
| #include "StringUtil.hh" | ||
| #include "slice_stream.hh" | ||
| #include <cstdint> | ||
| #include <string> | ||
|
|
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.
No description provided.