CBL-6592: active pusher should always send proposeChanges regardless … #2199
+7
−6
Conversation
This file contains 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
…of whether being version-vector or not. - There is one test failing, "Push After VV Upgrade", c.f. CBL-6593. It is disabled.
jianminzhao
changed the title
|
Code Coverage Results:
|
snej
requested changes
Dec 21, 2024
Replicator/ChangesFeed.cc
Outdated
| @@ -102,6 +102,7 @@ namespace litecore::repl { | |||
| try { | |||
| _db.useLocked([&](C4Database* db) { | |||
| Assert(db == _checkpointer->collection()->getDatabase()); | |||
| options.flags |= kC4RevIDGlobalForm; | |||
There was a problem hiding this comment.
Instead of changing C4DocEnumerator, you can just call DBAccess::convertVersionToAbsolute on the revID.
| @@ -93,7 +93,7 @@ namespace litecore::repl { | |||
| if ( !changes && req->body() != "null"_sl ) { | |||
| warn("Invalid body of 'changes' message"); | |||
| req->respondWithError({"BLIP"_sl, 400, "Invalid JSON body"_sl}); | |||
| } else if ( (!proposed && _mustBeProposed) || (proposed && _db->usingVersionVectors()) ) { | |||
| } else if ( !proposed && _mustBeProposed ) { | |||
There was a problem hiding this comment.
Delete "But with version vectors, always use "changes"." on line 98
snej
approved these changes
Jan 2, 2025
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.
…of whether being version-vector or not.