Multi-actor/Conflict tests and BTC pull replication conflict resolution #7286
+265
−107
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
Base automatically changed from
improve_blip_tester_client_locking
to
release/anemone
January 13, 2025 09:37
bbrks
force-pushed
the
btc_conflict_resolution
branch
from
2234e45 to
af9c239
Compare
torcolvin
reviewed
Jan 13, 2025
bbrks
force-pushed
the
btc_conflict_resolution
branch
from
56b325c to
cfa0bfb
Compare
torcolvin
reviewed
Jan 14, 2025
| return DocMetadataFromDocument(doc), doc.Body(ctx) | ||
| var body db.Body | ||
| if !doc.IsDeleted() { | ||
| body = doc.Body(ctx) |
There was a problem hiding this comment.
this will be nil when this occurs, are we intentionally returning empty body rather than nil?
There was a problem hiding this comment.
Some commentary on this change in the CouchbaseLiteMockPeer implementation - since for a tombstone body, there were variations of []byte({}) vs nil vs []byte{}.
I don't think it really matters as long as all peers treat it the same. It was required sincd waitForConvergingVersion is also comparing doc bodies.
// GetDocument returns the latest version of a document. The test will fail the document does not exist.
func (p *CouchbaseLiteMockPeer) GetDocument(dsName sgbucket.DataStoreName, docID string) (DocMetadata, db.Body) {
bodyBytes, meta := p.getLatestDocVersion(dsName, docID)
require.NotNil(p.TB(), meta, "docID:%s not found on %s", docID, p)
var body db.Body
// it's easier if all clients can return consistent bodies for tombstones
// lets just settle on nil, since we still need special handling anyway for `` vs `{}` so unmarshal doesn't barf
torcolvin
approved these changes
Jan 14, 2025
bbrks
commented
Jan 21, 2025
Comment on lines
+430
to
+464
| func FromHistoryForHLV(history string) (*HybridLogicalVector, error) { | ||
| hlv := NewHybridLogicalVector() | ||
| // split the history string into PV and MV | ||
| versionSets := strings.Split(history, ";") | ||
| switch len(versionSets) { | ||
| case 0: | ||
| // no versions present | ||
| return hlv, nil | ||
| case 2: | ||
| // MV | ||
| mvs := strings.Split(versionSets[1], ",") | ||
| for _, mv := range mvs { | ||
| v, err := ParseVersion(mv) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| hlv.MergeVersions[v.SourceID] = v.Value | ||
| } | ||
| fallthrough |
There was a problem hiding this comment.
This was for pre-beta implementation and needs removing/changing
…ring out already known revs
… converging versions
…one in conflict to a non-deletion client doc
…multiple mv and pv are present
bbrks
force-pushed
the
btc_conflict_resolution
branch
from
854ce7a to
f7014ad
Compare
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.
Enable multi-actor and conflict tests and allow BlipTesterClient to resolve conflicts and push up as new version.
Spun off two failing subtests into new ticket (CBG-4458) to get other improvements into
release/anemone